diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2021-03-07 07:56:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 07:56:44 +0300 |
| commit | 428a4b972737e0057c0b99d81809d0856850bcac (patch) | |
| tree | 289c1a1b65f3b362b0cac66d3c4ae49d9b879a41 /plugins/Marketplace | |
| parent | 5b289e4279d212b0395ab847eda4d05a7e0cda31 (diff) | |
Fix Marketplace falsely thinks a plugin is installed when it is not (#17278)
* Fix Marketplace falsely thinks a plugin is installed when it is not
* add test
Diffstat (limited to 'plugins/Marketplace')
| -rw-r--r-- | plugins/Marketplace/Controller.php | 4 | ||||
| -rw-r--r-- | plugins/Marketplace/Plugins.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Marketplace/Controller.php b/plugins/Marketplace/Controller.php index 3df8b04252..0c8efed1e1 100644 --- a/plugins/Marketplace/Controller.php +++ b/plugins/Marketplace/Controller.php @@ -245,7 +245,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin if (SettingsPiwik::isAutoUpdatePossible()) { foreach ($paidPlugins as $paidPlugin) { if ($this->canPluginBeInstalled($paidPlugin) - || ($this->pluginManager->isPluginInstalled($paidPlugin['name']) + || ($this->pluginManager->isPluginInstalled($paidPlugin['name'], true) && !$this->pluginManager->isPluginActivated($paidPlugin['name']))) { $paidPluginsToInstallAtOnce[] = $paidPlugin['name']; } @@ -499,7 +499,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $pluginName = $plugin['name']; - $isAlreadyInstalled = $this->pluginManager->isPluginInstalled($pluginName) + $isAlreadyInstalled = $this->pluginManager->isPluginInstalled($pluginName, true) || $this->pluginManager->isPluginLoaded($pluginName) || $this->pluginManager->isPluginActivated($pluginName); diff --git a/plugins/Marketplace/Plugins.php b/plugins/Marketplace/Plugins.php index 160c8d6063..5700f65f82 100644 --- a/plugins/Marketplace/Plugins.php +++ b/plugins/Marketplace/Plugins.php @@ -235,7 +235,7 @@ class Plugins return true; } - return $this->pluginManager->isPluginInstalled($pluginName); + return $this->pluginManager->isPluginInstalled($pluginName, true); } private function enrichPluginInformation($plugin) |