Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2019-11-13 03:26:28 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-11-13 03:26:28 +0300
commit91505ec0a86648f47d769783b42ec0b2b7edccf9 (patch)
tree1f52fda5b52e19cd1327aed73c19ee43a706e34e /plugins/CorePluginsAdmin/PluginInstaller.php
parente6c9ed6b3166343626083e02dcfd31541d6a0709 (diff)
Fix manual plugin upload process (#15152)
Diffstat (limited to 'plugins/CorePluginsAdmin/PluginInstaller.php')
-rw-r--r--plugins/CorePluginsAdmin/PluginInstaller.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 42c3cace3a..8fa3f92384 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -16,6 +16,7 @@ use Piwik\Piwik;
use Piwik\Plugin\Manager as PluginManager;
use Piwik\Plugin\Dependency as PluginDependency;
use Piwik\Plugin\Manager;
+use Piwik\Plugins\Marketplace\Environment;
use Piwik\Plugins\Marketplace\Marketplace;
use Piwik\Unzip;
use Piwik\Plugins\Marketplace\Api\Client;
@@ -197,7 +198,7 @@ class PluginInstaller
}
$dependency = new PluginDependency();
- $dependency->setEnvironment($this->marketplaceClient->getEnvironment());
+ $dependency->setEnvironment($this->getEnvironment());
$missingDependencies = $dependency->getMissingDependencies($requires);
if (!empty($missingDependencies)) {
@@ -348,4 +349,13 @@ class PluginInstaller
}
}
+ private function getEnvironment()
+ {
+ if ($this->marketplaceClient) {
+ return $this->marketplaceClient->getEnvironment();
+ } else {
+ return StaticContainer::get(Environment::class);
+ }
+ }
+
}