Fix redirect for photo remove tag page and only show the link if tags exist.

diff --git a/mod/photos.php b/mod/photos.php
index 82b5e43960d68a3708a2c4329072b53876d02cb8..57076fc9337966c5695841a694e5ced3a875762a 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1022,7 +1022,7 @@ function photos_content()
                                }
                        }
                        $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['removetitle']  = DI::l10n()->t('[Select tags to remove]');
                        }

diff --git a/src/Module/Post/Tag/Remove.php b/src/Module/Post/Tag/Remove.php
index e5652c79a8096f63874c36183d8b16df2fcb8f9d..4426c48b7fd95cce05db0073c9e8ef06de6b9db9 100644 (file)
--- a/src/Module/Post/Tag/Remove.php
+++ b/src/Module/Post/Tag/Remove.php
@@ -54,7 +54,7 @@ class Remove extends \Friendica\BaseModule
 
        protected function content(array $request = []): string
        {
-               $returnUrl = hex2bin($request['return'] ?? '');
+               $returnUrl = $request['return'] ?? '';
 
                if (!$this->session->getLocalUserId()) {
                        $this->baseUrl->redirect($returnUrl);
@@ -80,7 +80,7 @@ class Remove extends \Friendica\BaseModule
                if ($tag_text === '') {
                        $this->baseUrl->redirect($returnUrl);
                }
-               
+
                $tags = explode(',', $tag_text);
 
                $tag_checkboxes = array_map(function ($tag_text) {
@@ -97,7 +97,7 @@ class Remove extends \Friendica\BaseModule
                        ],
 
                        '$item_id'        => $item_id,
-                       '$return'         => $returnUrl,
+                       '$return'         => urlencode($returnUrl),
                        '$tag_checkboxes' => $tag_checkboxes,
                ]);
        }