From f757f69bd1b3beb520c7efab4882aef8e213ecf6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 22 Aug 2014 11:10:17 +0200
Subject: [PATCH] Change Menu load from config ini files to self provided
 configuration

refs #6639
---
 application/controllers/LayoutController.php       | 3 ++-
 application/layouts/scripts/parts/navigation.phtml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index 8df5c2c21..952c4ee61 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -18,8 +18,9 @@ class LayoutController extends ActionController
      */
     public function menuAction()
     {
+        $this->_helper->layout()->disableLayout();
         $this->view->menuRenderer = new MenuRenderer(
-            Menu::fromConfig()->order(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()
+            Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()
         );
     }
 
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 8b557e32f..019fba767 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -14,5 +14,5 @@ if (! $this->auth()->isAuthenticated()) {
   <form action="<?= $this->href('search') ?>" method="get" role="search">
     <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
   </form>
-<?= new MenuRenderer(Menu::fromConfig()->order(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
+<?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
 </div>