diff options
Diffstat (limited to 'core/Plugin/Manager.php')
-rw-r--r-- | core/Plugin/Manager.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index e1d0bc87fb..7931bfbd3d 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -81,6 +81,13 @@ class Manager extends Singleton { $toLoad = array(); foreach($this->readPluginsDirectory() as $plugin) { + $forceDisable = array( + 'ExampleVisualization', // adds an icon + 'LoginHttpAuth', // other Login plugins would conflict + ); + if(in_array($plugin, $forceDisable)) { + continue; + } // Load all default plugins $isPluginBundledWithCore = $this->isPluginBundledWithCore($plugin); @@ -119,11 +126,6 @@ class Manager extends Singleton if(empty($gitModules)) { $gitModules = file_get_contents(PIWIK_INCLUDE_PATH . '/.gitmodules'); } - - // other Login plugins would conflict - if($pluginName == 'LoginHttpAuth') { - return false; - } // All submodules are officially maintained plugins $isSubmodule = false !== strpos($gitModules, "plugins/" . $pluginName); return $isSubmodule; |