diff options
| -rw-r--r-- | core/Plugin/Manager.php | 8 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 4 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/Marketplace.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index aa89483b62..9f8941170b 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -360,7 +360,7 @@ class Manager extends Singleton if ($this->isPluginLoaded($pluginName)) { throw new \Exception("To uninstall the plugin $pluginName, first disable it in Piwik > Settings > Plugins"); } - $this->returnLoadedPluginsInfo(); + $this->loadAllPluginsAndGetTheirInfo(); \Piwik\Settings\Manager::cleanupPluginSettings($pluginName); @@ -541,7 +541,7 @@ class Manager extends Singleton * See {@link Piwik\Plugin::getInformation()}. * @api */ - public function returnLoadedPluginsInfo() + public function loadAllPluginsAndGetTheirInfo() { $language = Translate::getLanguageToLoad(); @@ -646,7 +646,7 @@ class Manager extends Singleton { $pluginsToLoad = array_unique($pluginsToLoad); $this->pluginsToLoad = $pluginsToLoad; - $this->reloadPlugins(); + $this->reloadActivatedPlugins(); } /** @@ -828,7 +828,7 @@ class Manager extends Singleton * Load the plugins classes installed. * Register the observers for every plugin. */ - private function reloadPlugins() + private function reloadActivatedPlugins() { if ($this->doLoadAlwaysActivatedPlugins) { $this->pluginsToLoad = array_merge($this->pluginsToLoad, $this->pluginToAlwaysActivate); diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 245a24ce11..b87fc91579 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -284,7 +284,7 @@ class Controller extends Plugin\ControllerAdmin protected function getPluginsInfo($themesOnly = false) { $pluginManager = \Piwik\Plugin\Manager::getInstance(); - $plugins = $pluginManager->returnLoadedPluginsInfo(); + $plugins = $pluginManager->loadAllPluginsAndGetTheirInfo(); foreach ($plugins as $pluginName => &$plugin) { @@ -370,7 +370,7 @@ class Controller extends Plugin\ControllerAdmin $view->lastError = $lastError; $view->isSuperUser = Piwik::hasUserSuperUserAccess(); $view->isAnonymousUser = Piwik::isUserIsAnonymous(); - $view->plugins = Plugin\Manager::getInstance()->returnLoadedPluginsInfo(); + $view->plugins = Plugin\Manager::getInstance()->loadAllPluginsAndGetTheirInfo(); $view->deactivateNonce = Nonce::getNonce(static::DEACTIVATE_NONCE); $view->uninstallNonce = Nonce::getNonce(static::UNINSTALL_NONCE); $view->emailSuperUser = implode(',', Piwik::getAllSuperUserAccessEmailAddresses()); diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php index 3b876131cf..6cb5a28105 100644 --- a/plugins/CorePluginsAdmin/Marketplace.php +++ b/plugins/CorePluginsAdmin/Marketplace.php @@ -105,7 +105,7 @@ class Marketplace public function getPluginsHavingUpdate($themesOnly) { $pluginManager = \Piwik\Plugin\Manager::getInstance(); - $pluginManager->returnLoadedPluginsInfo(); + $pluginManager->loadAllPluginsAndGetTheirInfo(); $loadedPlugins = $pluginManager->getLoadedPlugins(); try { |