refs #4053 display a possible error when displaying plugin detail

3 files changed, 15 insertions, 6 deletions

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 2735b6c9be..4ddf05e4e8 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -87,15 +87,21 @@ class Controller extends \Piwik\Controller\Admin
     public function pluginDetails()
     {
         $pluginName = Common::getRequestVar('pluginName', '', 'string');
+        $pluginName = strip_tags($pluginName);
 
         if (empty($pluginName)) {
             return;
         }
 
         $view = $this->configureView('@CorePluginsAdmin/pluginDetails');
+        $view->errorMessage = '';
 
-        $marketplace  = new MarketplaceApiClient();
-        $view->plugin = $marketplace->getPluginInfo($pluginName);
+        try {
+            $marketplace  = new MarketplaceApiClient();
+            $view->plugin = $marketplace->getPluginInfo($pluginName);
+        } catch (\Exception $e) {
+            $view->errorMessage = $e->getMessage();
+        }
 
         echo $view->render();
     }
diff --git a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
index df5fe0a586..dfdcc57965 100755
--- a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
+++ b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
@@ -65,8 +65,8 @@ $(document).ready(function () {
     });
 
     var showPopover = function (pluginName) {
-        var url = 'module=CorePluginsAdmin&action=pluginDetails&pluginName=' + pluginName;
-        Piwik_Popover.createPopupAndLoadUrl(url, 'theme details');
+        var url = 'module=CorePluginsAdmin&action=pluginDetails&pluginName=' + encodeURIComponent(pluginName);
+        Piwik_Popover.createPopupAndLoadUrl(url, 'details');
     };
 
     broadcast.addPopoverHandler('browsePluginDetail', showPopover);
diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
index 0e77b13d62..ffb80299e5 100644
--- a/plugins/CorePluginsAdmin/templates/pluginDetails.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -3,8 +3,11 @@
 
     <div style="max-width:980px;">
 
-        {{ plugin.detailPageHtml|raw }}
-
+        {% if errorMessage %}
+            {{ errorMessage }}
+        {% elseif plugin %}
+            {{ plugin.detailPageHtml|raw }}
+        {% endif %}
     </div>
 
 {% endblock %}