Return to the originating page when editing a folder/album. [#380]

This commit is contained in:
Solomon Peachy 2008-09-12 10:18:18 -04:00
parent ba9bceb5a1
commit 2b0f66d29a
5 changed files with 11 additions and 4 deletions

View File

@ -18,6 +18,7 @@ For further information about Photo Organizer, see its web site at:
[misc] When deleting a photo, return to the folder listing. [#379]
[fix] Album/Folder thumbnails respect the global popup flag [#376]
[fix] Fix the rating code for PG 8.3.x
[misc] When editing a folder/album, return to where you came. [#380]
2.36 (August 17, 2008)

View File

@ -70,7 +70,9 @@ if ($result) {
site_epilog($database);
if ($parent_album == "null") {
if (!$result) {
header("Location: $_SERVER[HTTP_REFERER]");
} elseif ($parent_album == "null") {
header("Location: ".generate_link('user', $po_user['id'], array(), TRUE));
} else {
header("Location: ".generate_link('album', $parent_album, array(), TRUE));

View File

@ -70,7 +70,9 @@ if ($go && ($album_id!="") && ($album_name!="")) {
}
site_epilog($database);
if ($album_parent == "null") {
if (!$result) {
header("Location: $_SERVER[HTTP_REFERER]");
} elseif ($parent_album == "null") {
header("Location: ".generate_link('user', $po_user['id'], array(), TRUE));
} else {
header("Location: ".generate_link('album', $parent_album, array(), TRUE));

View File

@ -47,7 +47,7 @@ site_epilog($database);
if (!$result) {
header("Location: $_SERVER[HTTP_REFERER]");
} else if ($parent_folder == "null") {
} elseif ($parent_folder == "null") {
header("Location: ".generate_link('user', $po_user['id'], array(), TRUE));
} else {
header("Location: ".generate_link('folder', $parent_folder, array(), TRUE));

View File

@ -62,7 +62,9 @@ if (($folder_id!="") && ($folder_name!="")) {
site_epilog($database);
if ($parent_folder == "null") {
if (!$result) {
header("Location: $_SERVER[HTTP_REFERER]");
} elseif ($parent_folder == "null") {
header("Location: ".generate_link('user', $po_user['id'], array(), TRUE));
} else {
header("Location: ".generate_link('folder', $parent_folder, array(), TRUE));