wip #3080

diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index c47cfce441691255931c21e9bf36e7c54681b7a5..864d62e8dfc2e05e16bacdd0cd98af811ec7ddff 100644 (file)
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -28,7 +28,7 @@ class Menu extends BaseMenu
     public function get($key, $name = self::_STANDARD_PREFIX)
     {
         if ($name) {
-            $key = $name . '_' . App::getLocale() . '_' . $key;
+            $key = $name . '_' . $key;
         }
         if (!$this->exists($key)) {
             $this->makeAllMenus();
@@ -43,7 +43,7 @@ class Menu extends BaseMenu
     {
         if (self::$_nav === null) {
             \Barryvdh\Debugbar\Facade::startMeasure('nav', 'Init Navigation object');
-            self::$_nav = Cache::remember('navigation', 43200, function () {
+            self::$_nav = Cache::remember('navigation_' . App::getLocale(), 43200, function () {
                 $nav = new Item();
                 $nav->initFromDatabase();
                 return $nav;
@@ -80,7 +80,7 @@ class Menu extends BaseMenu
             }
 
             $href = $page->getHref();
-            if ($href === '#' || $href === 'home') {
+            if ($href == '#' || $href == 'home') {
                 continue;
             }
 
@@ -95,7 +95,7 @@ class Menu extends BaseMenu
 
     public static function internalToHref($url)
     {
-        if (stripos($url, 'internal:') !== false) {
+        if (stristr($url, 'internal:')) {
             $e = explode(':', $url, 2);
             $url = $e[1];
         }
@@ -120,9 +120,8 @@ class Menu extends BaseMenu
             $this->makeStandardMenus($main);
         }
 
-        $key = self::_STANDARD_PREFIX . '_' . App::getLocale() . '_breadcrumbs';
         // Also make a menu for the breadcrumbs - this one is simpler and doesn't have the submenu headings
-        $this->make($key, function ($menu) use ($nav) {
+        $this->make(self::_STANDARD_PREFIX . '_breadcrumbs', function ($menu) use ($nav) {
             // Start with home link
             $menu = $menu->add(__('Accueil'), '');
             $this->_addToBreadcrumbs($nav, $menu);
@@ -131,14 +130,14 @@ class Menu extends BaseMenu
 
     public function makeStandardMenus($item)
     {
-        $this->make(self::_STANDARD_PREFIX . '_' . App::getLocale() . '_' . $item->getName(), function ($menu) use ($item) {
+        $this->make(self::_STANDARD_PREFIX . '_' . $item->getName(), function ($menu) use ($item) {
             $this->makeStandardMenu($menu, $item);
         });
-        $this->make('mobile_' . App::getLocale() . '_' . $item->getName(), function ($menu) use ($item) {
+        $this->make('mobile_' . $item->getName(), function ($menu) use ($item) {
             $this->makeMobileMenu($menu, $item);
         });
         foreach ($this->_registeredMenuMakers as $name => $registeredMenuMaker) {
-            $this->make($name . '_' . App::getLocale() . '_' . $item->getName(), function ($menu) use ($item, $registeredMenuMaker) {
+            $this->make($name . '_' . $item->getName(), function ($menu) use ($item, $registeredMenuMaker) {
                 call_user_func($registeredMenuMaker, $menu, $item);
             });
         }
@@ -188,7 +187,7 @@ class Menu extends BaseMenu
     protected function _addToBreadcrumbs($nav, $menu)
     {
         if ($nav->getTitle() && $nav->isBreadcrumbs()) {
-            if (strpos($nav->getBreadcrumbHref(), '#') === 0) {
+            if (substr($nav->getBreadcrumbHref(), 0, 1) == '#') {
                 $parent = $menu->raw($nav->getTitle());
             } else {
                 $parent = $menu->add($nav->getTitle(), $nav->getBreadcrumbHref());