moving "Plugins" and "Themes" to manage section. Displaying Marketplace only to superusers as it is already displayed in the user menu anyway

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php
index bda9caa9db..3133bed3e5 100644
--- a/plugins/CorePluginsAdmin/Menu.php
+++ b/plugins/CorePluginsAdmin/Menu.php
@@ -45,15 +45,15 @@ class Menu extends \Piwik\Plugin\Menu
         }
 
         if ($hasSuperUserAcess) {
-            $menu->addPlatformItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
+            $menu->addManageItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
                                    $this->urlForAction('plugins', array('activated' => '')),
-                                   $order = 1);
-            $menu->addPlatformItem(Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage,
+                                   $order = 4);
+            $menu->addManageItem(Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage,
                                    $this->urlForAction('themes', array('activated' => '')),
-                                   $order = 3);
+                                   $order = 5);
         }
 
-        if ($this->isAllowedToSeeMarketPlace()) {
+        if (Piwik::hasUserSuperUserAccess() && CorePluginsAdmin::isMarketplaceEnabled()) {
             $menu->addPlatformItem('CorePluginsAdmin_Marketplace',
                                    $this->urlForAction('browsePlugins', array('activated' => '')),
                                    $order = 5);