Tags router: unset Itemid for not matching menu, in the end of build (#…

…40455)
joomla · Apr 24, 2023 · fe8413e · fe8413e
1 parent c93bdfd
commit fe8413e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
@@ -127,6 +127,15 @@ 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;
     }
 
@@ -173,7 +182,7 @@ public function build(&$query)
             unset($query['view']);
         } else {
             $segments[] = $query['view'];
-            unset($query['view']);
+            unset($query['view'], $query['Itemid']);
 
             if (isset($query['id']) && is_array($query['id'])) {
                 foreach ($query['id'] as $id) {