Merge branch 'master' into morpheus_defaulttheme

2 files changed, 23 insertions, 12 deletions

diff --git a/plugins/SitesManager/Menu.php b/plugins/SitesManager/Menu.php
new file mode 100644
index 0000000000..0a991559f4
--- /dev/null
+++ b/plugins/SitesManager/Menu.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\SitesManager;
+
+use Piwik\Menu\MenuAdmin;
+use Piwik\Piwik;
+
+class Menu extends \Piwik\Plugin\Menu
+{
+    public function configureAdminMenu(MenuAdmin $menu)
+    {
+        $menu->add('CoreAdminHome_MenuManage', 'SitesManager_Sites',
+                   array('module' => 'SitesManager', 'action' => 'index'),
+                   Piwik::isUserHasSomeAdminAccess(),
+                   $order = 1);
+    }
+}
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index c41f4201f6..6053381396 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -8,9 +8,6 @@
  */
 namespace Piwik\Plugins\SitesManager;
 
-use Piwik\Menu\MenuAdmin;
-use Piwik\Piwik;
-
 /**
  *
  */
@@ -28,20 +25,11 @@ class SitesManager extends \Piwik\Plugin
         return array(
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
-            'Menu.Admin.addItems'                    => 'addMenu',
             'Tracker.Cache.getSiteAttributes'        => 'recordWebsiteDataInCache',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
         );
     }
 
-    function addMenu()
-    {
-        MenuAdmin::getInstance()->add('CoreAdminHome_MenuManage', 'SitesManager_Sites',
-            array('module' => 'SitesManager', 'action' => 'index'),
-            Piwik::isUserHasSomeAdminAccess(),
-            $order = 1);
-    }
-
     /**
      * Get CSS files
      */