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:
authorThomas Steur <thomas.steur@googlemail.com>2014-11-17 00:41:56 +0300
committerThomas Steur <thomas.steur@googlemail.com>2014-11-17 00:41:56 +0300
commitfa75233a5eeaf961f58055da073e206c95f020f2 (patch)
tree5b4477d67f4cdef6cd3470f9c1c71ba60a931236 /plugins/CorePluginsAdmin/PluginInstaller.php
parent74436365533366123a78bf646b245116b8c0c565 (diff)
refs #4485 better error message in case a not yet installed plugin is required
Diffstat (limited to 'plugins/CorePluginsAdmin/PluginInstaller.php')
-rw-r--r--plugins/CorePluginsAdmin/PluginInstaller.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 8bb9c475d0..84b254e86e 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -165,8 +165,14 @@ class PluginInstaller
if (!empty($missingDependencies)) {
$message = '';
foreach ($missingDependencies as $dep) {
- $params = array(ucfirst($dep['requirement']), $dep['actualVersion'], $dep['requiredVersion']);
- $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsNotice', $params);
+ if (empty($dep['actualVersion'])) {
+ $params = array(ucfirst($dep['requirement']), $dep['requiredVersion'], $metadata->name);
+ $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsPleaseInstallNotice', $params);
+ } else {
+ $params = array(ucfirst($dep['requirement']), $dep['actualVersion'], $dep['requiredVersion']);
+ $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsNotice', $params);
+ }
+
}
throw new PluginInstallerException($message);