From fa75233a5eeaf961f58055da073e206c95f020f2 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Sun, 16 Nov 2014 22:41:56 +0100 Subject: refs #4485 better error message in case a not yet installed plugin is required --- plugins/CorePluginsAdmin/PluginInstaller.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins/CorePluginsAdmin/PluginInstaller.php') 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); -- cgit v1.2.3