refs #7893 added possibility to measure mobile apps

1 files changed, 5 insertions, 24 deletions

diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 62a9954d39..25434468d1 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -78,28 +78,12 @@ class Manager
         'API',
         'Proxy',
         'LanguagesManager',
+        'WebsiteMeasurable',
 
         // default Piwik theme, always enabled
         self::DEFAULT_THEME,
     );
 
-    // Plugins bundled with core package, disabled by default
-    protected $corePluginsDisabledByDefault = array(
-        'DBStats',
-        'ExampleCommand',
-        'ExampleSettingsPlugin',
-        'ExampleUI',
-        'ExampleVisualization',
-        'ExamplePluginTemplate',
-        'ExampleTracker',
-        'ExampleReport'
-    );
-
-    // Themes bundled with core package, disabled by default
-    protected $coreThemesDisabledByDefault = array(
-        'ExampleTheme'
-    );
-
     private $trackerPluginsNotToLoad = array();
 
     /**
@@ -194,11 +178,6 @@ class Manager
         return $this->trackerPluginsNotToLoad;
     }
 
-    public function getCorePluginsDisabledByDefault()
-    {
-        return array_merge($this->corePluginsDisabledByDefault, $this->coreThemesDisabledByDefault);
-    }
-
     // If a plugin hooks onto at least an event starting with "Tracker.", we load the plugin during tracker
     const TRACKER_EVENT_PREFIX = 'Tracker.';
 
@@ -668,7 +647,7 @@ class Manager
     public function isPluginBundledWithCore($name)
     {
         return $this->isPluginEnabledByDefault($name)
-        || in_array($name, $this->getCorePluginsDisabledByDefault())
+        || in_array($name, $this->pluginList->getCorePluginsDisabledByDefault())
         || $name == self::DEFAULT_THEME;
     }
 
@@ -888,9 +867,11 @@ class Manager
      */
     public static function getAllPluginsNames()
     {
+        $pluginList = StaticContainer::get('Piwik\Application\Kernel\PluginList');
+
         $pluginsToLoad = array_merge(
             self::getInstance()->readPluginsDirectory(),
-            self::getInstance()->getCorePluginsDisabledByDefault()
+            $pluginList->getCorePluginsDisabledByDefault()
         );
         $pluginsToLoad = array_values(array_unique($pluginsToLoad));
         return $pluginsToLoad;