Merge remote-tracking branch 'origin/master'

4 files changed, 14 insertions, 13 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 36d494bf1b..eae956dd41 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -170,12 +170,10 @@ class Controller extends \Piwik\Controller\Admin
     {
         $view = $this->configureView('@CorePluginsAdmin/plugins');
 
-        $pluginsInfo = $this->getPluginsInfo();
-
         $view->updateNonce = Nonce::getNonce('CorePluginsAdmin.updatePlugin');
-        $view->pluginsInfo = $pluginsInfo;
+        $view->pluginsInfo = $this->getPluginsInfo();;
 
-        $view->pluginsHavingUpdate = $this->getPluginsHavingUpdate($pluginsInfo, $themesOnly = false);
+        $view->pluginsHavingUpdate = $this->getPluginsHavingUpdate($themesOnly = false);
 
         echo $view->render();
     }
@@ -293,7 +291,7 @@ class Controller extends \Piwik\Controller\Admin
      * @param bool $themesOnly
      * @return array
      */
-    private function getPluginsHavingUpdate($pluginsInfo, $themesOnly)
+    private function getPluginsHavingUpdate($themesOnly)
     {
         $loadedPlugins = PluginsManager::getInstance()->getLoadedPlugins();
 
@@ -306,11 +304,14 @@ class Controller extends \Piwik\Controller\Admin
         }
 
         foreach ($pluginsHavingUpdate as $updatePlugin) {
-            foreach ($pluginsInfo as $pluginName => $plugin) {
-                // TODO check if pluginName == $plugin
-                $updatePlugin->currentVersion = $plugin['info']['version'];
-                $updatePlugin->isActivated = $plugin['activated'];
-                break;
+            foreach ($loadedPlugins as $loadedPlugin) {
+
+                if ($loadedPlugin->getPluginName() == $updatePlugin->name) {
+                    $updatePlugin->currentVersion = $loadedPlugin->getVersion();
+                    $updatePlugin->isActivated = PluginsManager::getInstance()->isPluginActivated($updatePlugin->name);
+                    break;
+
+                }
             }
 
         }
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 8e724798fd..62b7e74186 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -1,4 +1,4 @@
-{% macro tablePluginUpdates(pluginsHavingUpdate, pluginsInfo, nonce, isTheme) %}
+{% macro tablePluginUpdates(pluginsHavingUpdate, nonce, isTheme) %}
 
     <div class='entityContainer'>
         <table class="dataTable entityTable">
diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 9accec902b..34375460ff 100644
--- a/plugins/CorePluginsAdmin/templates/plugins.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -8,7 +8,7 @@
     {% if pluginsHavingUpdate|length %}
         <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2>
 
-        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, pluginsInfo, updateNonce, 0) }}
+        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, 0) }}
     {% endif %}
 
     <h2>{{ 'CorePluginsAdmin_PluginsManagement'|translate }}</h2>
diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
index 3f9a1a2606..b77b6dd58c 100644
--- a/plugins/CorePluginsAdmin/templates/themes.twig
+++ b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -8,7 +8,7 @@
     {% if pluginsHavingUpdate|length %}
         <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2>
 
-        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, pluginsInfo, updateNonce, true) }}
+        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, true) }}
     {% endif %}
 
     <h2>{{ 'CorePluginsAdmin_ThemesManagement'|translate }}</h2>