diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-04 03:10:40 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 13:17:27 +0300 |
commit | 3a6d626c2474b83ea5c4125fd33dfe12b9e0bf8a (patch) | |
tree | 9de2cd1d85e1f8a7211f0514f8deae2b152faa89 /core/Plugin/ControllerAdmin.php | |
parent | 780c09b144e048cc748429bc06d016354d44746e (diff) |
refs #9354 merge user and admin menu to one single menu
Diffstat (limited to 'core/Plugin/ControllerAdmin.php')
-rw-r--r-- | core/Plugin/ControllerAdmin.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php index a0658c4142..51ff540b98 100644 --- a/core/Plugin/ControllerAdmin.php +++ b/core/Plugin/ControllerAdmin.php @@ -13,7 +13,6 @@ use Piwik\Config; use Piwik\Development; use Piwik\Menu\MenuAdmin; use Piwik\Menu\MenuTop; -use Piwik\Menu\MenuUser; use Piwik\Notification; use Piwik\Notification\Manager as NotificationManager; use Piwik\Piwik; @@ -218,8 +217,7 @@ abstract class ControllerAdmin extends Controller self::notifyIfEAcceleratorIsUsed(); self::notifyIfURLIsNotSecure(); - $view->topMenu = MenuTop::getInstance()->getMenu(); - $view->userMenu = MenuUser::getInstance()->getMenu(); + $view->topMenu = MenuTop::getInstance()->getMenu(); $view->isDataPurgeSettingsEnabled = self::isDataPurgeSettingsEnabled(); $enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings']; @@ -239,8 +237,7 @@ abstract class ControllerAdmin extends Controller self::notifyWhenDebugOnDemandIsEnabled('debug'); self::notifyWhenDebugOnDemandIsEnabled('debug_on_demand'); - $adminMenu = MenuAdmin::getInstance()->getMenu(); - $view->adminMenu = $adminMenu; + $view->adminMenu = MenuAdmin::getInstance()->getMenu(); $notifications = $view->notifications; |