Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-07 18:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14933 from haheute/fix-photo-tag-remove-redirect

Browse source 
Fix redirect for photo remove tag page and only show the link if tags…
This commit is contained in:
Philipp 2025-05-14 20:16:44 +02:00 • committed by GitHub
commit 0165e22064
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/photos.php
View file

@ -1022,7 +1022,7 @@ function photos_content()
} }
} }
$tags = ['title' => DI::l10n()->t('Tags: '), 'tags' => $tag_arr]; $tags = ['title' => DI::l10n()->t('Tags: '), 'tags' => $tag_arr];
if ($cmd === 'edit') { if ($cmd === 'edit' && !empty($tag_arr)) {
$tags['removeanyurl'] = 'post/' . $link_item['id'] . '/tag/remove?return=' . urlencode(DI::args()->getCommand()); $tags['removeanyurl'] = 'post/' . $link_item['id'] . '/tag/remove?return=' . urlencode(DI::args()->getCommand());
$tags['removetitle'] = DI::l10n()->t('[Select tags to remove]'); $tags['removetitle'] = DI::l10n()->t('[Select tags to remove]');
} }

4
src/Module/Post/Tag/Remove.php
View file

@ -54,7 +54,7 @@ class Remove extends \Friendica\BaseModule
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
$returnUrl = hex2bin($request['return'] ?? ''); $returnUrl = $request['return'] ?? '';
if (!$this->session->getLocalUserId()) { if (!$this->session->getLocalUserId()) {
$this->baseUrl->redirect($returnUrl); $this->baseUrl->redirect($returnUrl);
@ -97,7 +97,7 @@ class Remove extends \Friendica\BaseModule
], ],
'$item_id' => $item_id, '$item_id' => $item_id,
'$return' => $returnUrl, '$return' => urlencode($returnUrl),
'$tag_checkboxes' => $tag_checkboxes, '$tag_checkboxes' => $tag_checkboxes,
]); ]);
} }