Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2017-09-10 20:03:56 +0300
committerStefan Giehl <stefan@piwik.org>2017-09-11 16:24:20 +0300
commit61950f7cae32d6420a509eb11e300d12d06ce2e2 (patch)
treee1ea9b39dc1b53a0d3022b6d41b696a8f7fb60e4 /plugins/Marketplace
parentf0ddb70c85a6211540797665f17d36b6d79128a4 (diff)
use raw notification if exception contains html message
Diffstat (limited to 'plugins/Marketplace')
-rw-r--r--plugins/Marketplace/Controller.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/Marketplace/Controller.php b/plugins/Marketplace/Controller.php
index 418c39dc42..679ff77cf7 100644
--- a/plugins/Marketplace/Controller.php
+++ b/plugins/Marketplace/Controller.php
@@ -303,6 +303,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$notification = new Notification($e->getMessage());
$notification->context = Notification::CONTEXT_ERROR;
+ if (method_exists($e, 'isHtmlMessage') && $e->isHtmlMessage()) {
+ $notification->raw = true;
+ }
Notification\Manager::notify('Marketplace_Install' . $pluginName, $notification);
$hasErrors = true;
@@ -404,6 +407,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$notification->context = Notification::CONTEXT_ERROR;
$notification->type = Notification::TYPE_PERSISTENT;
$notification->flags = Notification::FLAG_CLEAR;
+ if (method_exists($e, 'isHtmlMessage') && $e->isHtmlMessage()) {
+ $notification->raw = true;
+ }
Notification\Manager::notify('CorePluginsAdmin_InstallPlugin', $notification);
Url::redirectToReferrer();