#2843

diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index 3ebecc58c9b85331a32c6fbc76906db25c7937a3..a2e99133841cce4b909db3d71280c046c0c53fda 100644 (file)
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -18,6 +18,7 @@ class Menu extends BaseMenu
     public function makeAllMenus()
     {
         $tree = CMSPage::getTree();
+        $all_nav_items = [];
         foreach ($tree as $mainKey => $main) {
             $nav_items = [];
             foreach ($main['children'] as $name => $item) {
@@ -40,11 +41,10 @@ class Menu extends BaseMenu
 
                 $nav_items[$item['element']->title] = $s;
             }
+            $all_nav_items[] = $nav_items;
 
-            \Menu::make($mainKey, function ($menu) use ($nav_items) {
-
+            $this->make($mainKey, function ($menu) use ($nav_items) {
                 foreach ($nav_items as $nav_label => $nav_item) {
-
                     $parent = $menu->add($nav_label, $nav_item['url']);
 
                     // Handle items with submenus
@@ -65,20 +65,16 @@ class Menu extends BaseMenu
                             }
                         }
                     }
-
                 }
-
             });
         }
 
 
-        if ($mainKey == '#main') {
-            // Also make a menu for the breadcrumbs - this one is simpler and doesn't have the submenu headings
-            \Menu::make('breadcrumbs', function ($menu) use ($nav_items) {
-
-                // Start with home link
-                $menu = $menu->add('Home', '');
-
+        // Also make a menu for the breadcrumbs - this one is simpler and doesn't have the submenu headings
+        $this->make('breadcrumbs', function ($menu) use ($all_nav_items) {
+            // Start with home link
+            $menu = $menu->add('Home', '');
+            foreach ($all_nav_items as $nav_items) {
                 foreach ($nav_items as $nav_label => $nav_item) {
 
                     $parent = $menu->add($nav_label, $nav_item['url']);
@@ -93,7 +89,7 @@ class Menu extends BaseMenu
                         }
                     }
                 }
-            });
-        }
+            }
+        });
     }
 }