From f814ca30d3062a07ccd19b67a8554626b645476f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 Mar 2020 09:56:02 -0500 Subject: [PATCH] Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos --- mod/photos.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 0c94471c04..ef957ad5b0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -204,13 +204,13 @@ function photos_post(App $a) if (!DBA::isResult($r)) { notice(DI::l10n()->t('Album not found.') . EOL); - DI::baseUrl()->redirect($_SESSION['photo_return']); + DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album'); return; // NOTREACHED } // Check if the user has responded to a delete confirmation query if (!empty($_REQUEST['canceled'])) { - DI::baseUrl()->redirect($_SESSION['photo_return']); + DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album/' . $a->argv[3]); } // RENAME photo album @@ -267,7 +267,7 @@ function photos_post(App $a) } } - DI::baseUrl()->redirect('photos/' . $a->argv[1]); + DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album'); } if ($a->argc > 3 && $a->argv[2] === 'image') {