Resolving a problem with global state messing up with tests

1 files changed, 13 insertions, 3 deletions

diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php
index 1c8e7f9800..7651a1199d 100644
--- a/core/Menu/MenuAbstract.php
+++ b/core/Menu/MenuAbstract.php
@@ -55,9 +55,9 @@ abstract class MenuAbstract extends Singleton
      */
     protected function getAllMenus()
     {
-//        if (!empty(self::$menus)) {
-//            return self::$menus;
-//        }
+        if (!empty(self::$menus)) {
+            return self::$menus;
+        }
 
         self::$menus = PluginManager::getInstance()->findComponents('Menu', 'Piwik\\Plugin\\Menu');
 
@@ -65,6 +65,16 @@ abstract class MenuAbstract extends Singleton
     }
 
     /**
+     * To use only for tests.
+     *
+     * @deprecated The whole $menus cache should be replaced by a real transient cache
+     */
+    public static function clearMenus()
+    {
+        self::$menus = array();
+    }
+
+    /**
      * Adds a new entry to the menu.
      *
      * @param string $menuName The menu's category name. Can be a translation token.