refs #4183 verify plugin version

matomo-org · Jan 9, 2014 · 480421a · 480421a
1 parent 91dc08c
commit 480421a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/plugins/CorePluginsAdmin/PluginDependency.php b/plugins/CorePluginsAdmin/PluginDependency.php
@@ -9,8 +9,10 @@
  * @package CorePluginsAdmin
  */
 namespace Piwik\Plugins\CorePluginsAdmin;
-use Piwik\Version;
 
+use Composer\Plugin\PluginManager;
+use Piwik\Version;
+use Piwik\Plugin\Manager as PluginManager;
 /**
  *
  * @package CorePluginsAdmin
@@ -56,12 +58,20 @@ private function getCurrentVersion($name)
                 return PHP_VERSION;
             default:
                 try {
-                    $plugin = \Piwik\Plugin\Manager::getInstance()->loadPlugin(ucfirst($name));
+                    $pluginNames = PluginManager::getAllPluginsNames();
+
+                    if (!in_array($name, $pluginNames) || !PluginManager::getInstance()->isPluginLoaded($name)) {
+                        return '';
+                    }
+
+                    $plugin = PluginManager::getInstance()->loadPlugin(ucfirst($name));
 
                     if (!empty($plugin)) {
                         return $plugin->getVersion();
                     }
                 } catch (\Exception $e) {}
         }
+
+        return '';
     }
 }