diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-31 04:58:31 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-31 04:58:31 +0300 |
commit | 7055eb4efffc46590f9cdc41e908625e7621ad34 (patch) | |
tree | 3bb325459a376338dc0986187af0e6ca0c9826c0 /plugins/CorePluginsAdmin | |
parent | b20e2ba8b832ec3f683bbc4b3f805bd9a3c84f67 (diff) |
refs #6009 renamed some plugin manager methods
Diffstat (limited to 'plugins/CorePluginsAdmin')
-rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 4 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/Marketplace.php | 2 |
2 files changed, 3 insertions, 3 deletions
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 { |