refs #5192 introducing a user menu

4 files changed, 7 insertions, 8 deletions

diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
index 0b41bb33c5..899b417849 100644
--- a/core/Menu/MenuAdmin.php
+++ b/core/Menu/MenuAdmin.php
@@ -49,11 +49,6 @@ class MenuAdmin extends MenuAbstract
         self::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
     }
 
-    public function add($adminMenuName, $url, $displayedForCurrentUser = true, $order = 20)
-    {
-        parent::add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
-    }
-
     /**
      * Triggers the Menu.MenuAdmin.addItems hook and returns the admin menu.
      *
diff --git a/core/Menu/MenuUser.php b/core/Menu/MenuUser.php
index dd27fa4aef..f492916794 100755
--- a/core/Menu/MenuUser.php
+++ b/core/Menu/MenuUser.php
@@ -31,7 +31,7 @@ use Piwik\Piwik;
  * 
  * @method static \Piwik\Menu\MenuUser getInstance()
  */
-class MenuUser extends MenuTop
+class MenuUser extends MenuAbstract
 {
 
     /**
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index e767b1de4b..9fd08fd2d0 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -19,6 +19,7 @@ use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuTop;
+use Piwik\Menu\MenuUser;
 use Piwik\NoAccessException;
 use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Period\Month;
@@ -563,7 +564,8 @@ abstract class Controller
 
             $this->setBasicVariablesView($view);
 
-            $view->topMenu = MenuTop::getInstance()->getMenu();
+            $view->topMenu  = MenuTop::getInstance()->getMenu();
+            $view->userMenu = MenuUser::getInstance()->getMenu();
 
             $notifications = $view->notifications;
             if (empty($notifications)) {
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 4f8f885ef9..b3799c2ac6 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -12,6 +12,7 @@ use Piwik\Config as PiwikConfig;
 use Piwik\Config;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
+use Piwik\Menu\MenuUser;
 use Piwik\Notification;
 use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Piwik;
@@ -160,7 +161,8 @@ abstract class ControllerAdmin extends Controller
         self::notifyWhenTrackingStatisticsDisabled();
         self::notifyIfEAcceleratorIsUsed();
 
-        $view->topMenu = MenuTop::getInstance()->getMenu();
+        $view->topMenu  = MenuTop::getInstance()->getMenu();
+        $view->userMenu = MenuUser::getInstance()->getMenu();
         $view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName();
 
         $view->isDataPurgeSettingsEnabled = self::isDataPurgeSettingsEnabled();