Merge branch 'master' into morpheus_defaulttheme

1 files changed, 0 insertions, 25 deletions

diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index 16914db051..d06345eee2 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -12,11 +12,8 @@ use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
 use Piwik\Db;
-use Piwik\Menu\MenuAdmin;
-use Piwik\Piwik;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime;
-use Piwik\Settings\Manager as SettingsManager;
 use Piwik\Settings\UserSetting;
 
 /**
@@ -32,7 +29,6 @@ class CoreAdminHome extends \Piwik\Plugin
         return array(
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
-            'Menu.Admin.addItems'             => 'addMenu',
             'TaskScheduler.getScheduledTasks' => 'getScheduledTasks',
             'UsersManager.deleteUser'         => 'cleanupUser'
         );
@@ -87,27 +83,6 @@ class CoreAdminHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/CoreAdminHome/javascripts/pluginSettings.js";
     }
 
-    function addMenu()
-    {
-        MenuAdmin::getInstance()->add('CoreAdminHome_MenuManage', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 1);
-        MenuAdmin::getInstance()->add('CoreAdminHome_MenuDiagnostic', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 10);
-        MenuAdmin::getInstance()->add('General_Settings', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 5);
-        MenuAdmin::getInstance()->add('General_Settings', 'CoreAdminHome_MenuGeneralSettings',
-            array('module' => 'CoreAdminHome', 'action' => 'generalSettings'),
-            Piwik::isUserHasSomeAdminAccess(),
-            $order = 6);
-        MenuAdmin::getInstance()->add('CoreAdminHome_MenuManage', 'CoreAdminHome_TrackingCode',
-            array('module' => 'CoreAdminHome', 'action' => 'trackingCodeGenerator'),
-            Piwik::isUserHasSomeAdminAccess(),
-            $order = 4);
-
-        MenuAdmin::getInstance()->add('General_Settings', 'CoreAdminHome_PluginSettings',
-            array('module' => 'CoreAdminHome', 'action' => 'pluginSettings'),
-            SettingsManager::hasPluginsSettingsForCurrentUser(),
-            $order = 7);
-
-    }
-
     function purgeOutdatedArchives()
     {
         $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();