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:
authorStefan Giehl <stefan@piwik.org>2017-05-08 10:42:21 +0300
committerGitHub <noreply@github.com>2017-05-08 10:42:21 +0300
commit9d3d0440dd6bd74ec4a375b0dd78ce73197ecc8a (patch)
tree6b4dbdf05b53011eb78381c5876e3f86c2c316a1 /plugins/CorePluginsAdmin/Controller.php
parente9b69140a349f29de64aee30a033cd3bb87db072 (diff)
Improve message in plugin admin if a plugin is not found in filesystem (#11629)
* Improve message in plugin admin if a plugin is not found in filesystem * use plugin manager method
Diffstat (limited to 'plugins/CorePluginsAdmin/Controller.php')
-rw-r--r--plugins/CorePluginsAdmin/Controller.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index d2b0b305e4..1e1b5743ed 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -247,10 +247,19 @@ class Controller extends Plugin\ControllerAdmin
$suffix = "You may uninstall the plugin or manually delete the files in piwik/plugins/$pluginName/";
}
- $description = '<strong>'
- . $this->translator->translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion()))
- . '</strong><br/>'
- . $suffix;
+ if ($this->pluginManager->isPluginInFilesystem($pluginName)) {
+ $description = '<strong>'
+ . $this->translator->translate('CorePluginsAdmin_PluginNotCompatibleWith',
+ array($pluginName, self::getPiwikVersion()))
+ . '</strong><br/>'
+ . $suffix;
+ } else {
+ $description = '<strong>'
+ . $this->translator->translate('CorePluginsAdmin_PluginNotFound',
+ array($pluginName))
+ . '</strong><br/>'
+ . $this->translator->translate('CorePluginsAdmin_PluginNotFoundAlternative');
+ }
$plugin['info'] = array(
'description' => $description,
'version' => $this->translator->translate('General_Unknown'),