strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8352 from MrPetovan/bug/8002-album-drop-cancel

Browse source 
Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos
This commit is contained in:
Philipp 2020-03-01 22:21:33 +01:00 committed by GitHub
parent 057df09ffb f814ca30d3
commit 27b60b200e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/photos.php
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') {

3
view/templates/photo_album.tpl
View file

@ -1,8 +1,5 @@
<h3 id="photo-album-title">{{$album}}</h3> <h3 id="photo-album-title">{{$album}}</h3>
{{if $edit}}
<div id="album-edit-link"><a href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a></div>
{{/if}}
{{if $edit}} {{if $edit}}
<div id="album-edit-link"><a href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a></div> <div id="album-edit-link"><a href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a></div>
{{/if}} {{/if}}