Look for a menu when none specified

joomlashack · Jul 15, 2022 · e4f5e50 · e4f5e50
1 parent 4d0f775
commit e4f5e50
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/site/router.php b/src/site/router.php
@@ -355,13 +355,31 @@ public function preprocess($query)
             $parts  = $query;
 
             if ($view) {
-                if ($view == 'downloads') {
-                    $listMenu = $this->helper->getMenuItemForListOfFiles($id)
-                        ?: $this->helper->getMenuItemForListOfFiles(0);
+                switch ($view) {
+                    case 'item':
+                        if (empty($itemId)) {
+                            // Try to find a menu
+                            $menu = $this->helper->getMenuItemForFile($id);
+                            if (empty($menu)) {
+                                if ($category = $this->helper->getCategoryFromFileId($id)) {
+                                    $menu = $this->helper->getMenuItemForCategoryTreeRecursively($category->id);
+                                }
+                            }
+                            if ($menu) {
+                                $itemId = $menu->id;
+                            }
+                        }
+                        break;
+
+                    case 'downloads':
+                        $listMenu = $this->helper->getMenuItemForListOfFiles($id)
+                            ?: $this->helper->getMenuItemForListOfFiles(0);
+
+                        if ($listMenu) {
+                            $itemId = $listMenu->id;
+                        }
+                        break;
 
-                    if ($listMenu) {
-                        $itemId = $listMenu->id;
-                    }
                 }
 
             } elseif ($task && $id) {