Tags router: do not force incorrect Itemid (#40448)

joomla · Apr 21, 2023 · c93bdfd · c93bdfd
1 parent 1e601c5
commit c93bdfd
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
@@ -127,15 +127,6 @@ public function preprocess($query)
             $query['Itemid'] = $active->id;
         }
 
-        // If not found, return language specific home link
-        if (!isset($query['Itemid'])) {
-            $default = $this->menu->getDefault($language);
-
-            if (!empty($default->id)) {
-                $query['Itemid'] = $default->id;
-            }
-        }
-
         return $query;
     }
 
@@ -152,9 +143,9 @@ public function build(&$query)
     {
         $segments = [];
 
-        $menuItem = $this->menu->getItem($query['Itemid']);
+        $menuItem = !empty($query['Itemid']) ? $this->menu->getItem($query['Itemid']) : false;
 
-        if ($menuItem->query['option'] == 'com_tags') {
+        if ($menuItem && $menuItem->query['option'] == 'com_tags') {
             if ($menuItem->query['view'] == 'tags' && isset($query['id'])) {
                 $ids = $query['id'];