diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-06-19 13:13:03 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-06-19 13:13:03 +0300 |
commit | 401f59d168d3a22b694170b9db32f4fe19b1dc5e (patch) | |
tree | c0142d424fd4436f657de477795078b1ace9b13f /core | |
parent | 7a23a898cac3694632542462a54dd8ebfcc7ba68 (diff) |
Resolving a problem with global state messing up with tests
Diffstat (limited to 'core')
-rw-r--r-- | core/Menu/MenuAbstract.php | 16 |
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. |