refs #4053 simplify getInfoOfPluginsHavingUpdate

2 files changed, 5 insertions, 28 deletions

diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index 2f52ba6404..f2b9e18df5 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -83,11 +83,7 @@ class Marketplace
         $loadedPlugins = $pluginManager->getLoadedPlugins();
 
         try {
-            if ($themesOnly) {
-                $pluginsHavingUpdate = $this->client->getInfoOfThemesHavingUpdate($loadedPlugins);
-            } else {
-                $pluginsHavingUpdate = $this->client->getInfoOfPluginsHavingUpdate($loadedPlugins);
-            }
+            $pluginsHavingUpdate = $this->client->getInfoOfPluginsHavingUpdate($loadedPlugins, $themesOnly);
 
         } catch (\Exception $e) {
             $pluginsHavingUpdate = array();
diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
index 1455b611b7..19c8cf636a 100644
--- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php
+++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
@@ -83,10 +83,11 @@ class MarketplaceApiClient
     }
 
     /**
-     * @param \Piwik\Plugin[] $plugins
+     * @param  \Piwik\Plugin[] $plugins
+     * @param  bool            $themesOnly
      * @return array
      */
-    public function getInfoOfPluginsHavingUpdate($plugins)
+    public function getInfoOfPluginsHavingUpdate($plugins, $themesOnly)
     {
         $hasUpdates = $this->checkUpdates($plugins);
 
@@ -95,27 +96,7 @@ class MarketplaceApiClient
         foreach ($hasUpdates as $pluginHavingUpdate) {
             $plugin = $this->getPluginInfo($pluginHavingUpdate->name);
 
-            if (empty($plugin->isTheme)) {
-                $pluginDetails[] = $plugin;
-            }
-        }
-
-        return $pluginDetails;
-    }
-
-    /**
-     * @param \Piwik\Plugin[] $plugins
-     * @return array
-     */
-    public function getInfoOfThemesHavingUpdate($plugins)
-    {
-        $hasUpdates = $this->checkUpdates($plugins);
-
-        $pluginDetails = array();
-        foreach ($hasUpdates as $pluginHavingUpdate) {
-            $plugin = $this->getPluginInfo($pluginHavingUpdate->name);
-
-            if (!empty($plugin->isTheme)) {
+            if (!empty($plugin->isTheme) == $themesOnly) {
                 $pluginDetails[] = $plugin;
             }
         }