diff options
Diffstat (limited to 'plugins/CorePluginsAdmin')
| -rw-r--r-- | plugins/CorePluginsAdmin/MarketplaceApiClient.php | 10 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/PluginInstaller.php | 9 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/config/config.php | 7 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/lang/es.json | 4 |
4 files changed, 29 insertions, 1 deletions
diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php index 0423f72600..ee20abc918 100644 --- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php +++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Piwik\Cache; +use Piwik\Container\StaticContainer; use Piwik\Http; use Piwik\Version; @@ -123,9 +124,16 @@ class MarketplaceApiClient return array(); } + public static function getPiwikVersion() + { + return StaticContainer::get('marketplacePiwikVersion'); + } + private function fetch($action, $params) { ksort($params); + $params['piwik'] = self::getPiwikVersion(); + $params['php'] = PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION; $query = http_build_query($params); $cacheId = $this->getCacheKey($action, $query); @@ -180,7 +188,7 @@ class MarketplaceApiClient $latestVersion = array_pop($plugin['versions']); $downloadUrl = $latestVersion['download']; - return $this->domain . $downloadUrl . '?coreVersion=' . Version::VERSION; + return $this->domain . $downloadUrl . '?coreVersion=' . self::getPiwikVersion(); } } diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index ed140d27bc..ab4f7b8622 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -12,6 +12,7 @@ use Piwik\Container\StaticContainer; use Piwik\Filechecks; use Piwik\Filesystem; use Piwik\Piwik; +use Piwik\Plugin\Manager as PluginManager; use Piwik\Plugin\Dependency as PluginDependency; use Piwik\Unzip; @@ -49,6 +50,11 @@ class PluginInstaller Filesystem::deleteAllCacheOnUpdate($this->pluginName); + $plugin = PluginManager::getInstance()->getLoadedPlugin($this->pluginName); + if (!empty($plugin)) { + $plugin->reloadPluginInformation(); + } + } catch (\Exception $e) { $this->removeFileIfExists($tmpPluginZip); @@ -160,7 +166,10 @@ class PluginInstaller $requires = (array) $metadata->require; } + $piwikVersion = MarketplaceApiClient::getPiwikVersion(); + $dependency = new PluginDependency(); + $dependency->setPiwikVersion($piwikVersion); $missingDependencies = $dependency->getMissingDependencies($requires); if (!empty($missingDependencies)) { diff --git a/plugins/CorePluginsAdmin/config/config.php b/plugins/CorePluginsAdmin/config/config.php new file mode 100644 index 0000000000..5d30748a94 --- /dev/null +++ b/plugins/CorePluginsAdmin/config/config.php @@ -0,0 +1,7 @@ +<?php + +return array( + 'marketplacePiwikVersion' => function () { + return \Piwik\Version::VERSION; + } +); diff --git a/plugins/CorePluginsAdmin/lang/es.json b/plugins/CorePluginsAdmin/lang/es.json index b0407c02ae..b4a91d7d0a 100644 --- a/plugins/CorePluginsAdmin/lang/es.json +++ b/plugins/CorePluginsAdmin/lang/es.json @@ -38,6 +38,10 @@ "LastCommitTime": "(último cambio %s)", "LastUpdated": "Última actualización", "LicenseHomepage": "Página de la licencia", + "LikeThisPlugin": "¿Satisfecho con este complemento?", + "ConsiderDonating": "Considere una donación", + "CommunityContributedPlugin": "Este es un complemento basado en la suma de voluntades de una comunidad ofrendada de manera gratuita.", + "ConsiderDonatingCreatorOf": "Por favor considere donar al creador de %s", "PluginsExtendPiwik": "Los complementos extienden y amplían las funcionalidades de Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Una vez que el complemento está instalado, puede activarlo o desactivarlo desde aquí.", "Marketplace": "Mercado", |