Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos

This commit is contained in:
Hypolite Petovan 2020-03-01 09:56:02 -05:00
parent b6fa528b63
commit f814ca30d3

View file

@ -204,13 +204,13 @@ function photos_post(App $a)
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(DI::l10n()->t('Album not found.') . EOL); 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 return; // NOTREACHED
} }
// Check if the user has responded to a delete confirmation query // Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) { 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 // 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') { if ($a->argc > 3 && $a->argv[2] === 'image') {