diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2013-11-12 04:06:09 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2013-11-12 04:06:09 +0400 |
commit | 6abcb0db75324ff39f6557a1bcfcf90bc1a03d69 (patch) | |
tree | f50d9bad9150e92c6847835caf724f0cc51a6567 /plugins | |
parent | 84bc3eb3bba66823fe679db023b8b03cba9f0d10 (diff) |
refs #4256 by default escape notification message
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/CoreHome/templates/_notifications.twig | 2 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 2 | ||||
-rw-r--r-- | plugins/ExampleUI/Controller.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/CoreHome/templates/_notifications.twig b/plugins/CoreHome/templates/_notifications.twig index 6ac69a9c22..0f3254e5e5 100644 --- a/plugins/CoreHome/templates/_notifications.twig +++ b/plugins/CoreHome/templates/_notifications.twig @@ -2,7 +2,7 @@ {% if notifications|length %} {% for notificationId, n in notifications %} - {{ n.message|notification({'id': notificationId, 'type': n.type, 'title': n.title, 'noclear': n.hasNoClear, 'context': n.context}, false) }} + {{ n.message|notification({'id': notificationId, 'type': n.type, 'title': n.title, 'noclear': n.hasNoClear, 'context': n.context, 'raw': n.raw}, false) }} {% endfor %} {% endif %} diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 92f5f9deba..31266da883 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -352,7 +352,7 @@ class Controller extends Plugin\ControllerAdmin $message .= ' ' . Piwik::translate('CorePluginsAdmin_ChangeSettingsPossible', array($target)); } - $notification = new Notification($message); + $notification = new Notification($message, true); $notification->title = Piwik::translate('General_WellDone'); $notification->context = Notification::CONTEXT_SUCCESS; Notification\Manager::notify('CorePluginsAdmin_PluginActivated', $notification); diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index 0480ae83cf..ab64b2bdda 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -71,7 +71,7 @@ class Controller extends \Piwik\Plugin\Controller $notification->type = Notification::TYPE_TOAST; Notification\Manager::notify('ExampleUI_successToast', $notification); - $notification = new Notification('Phasellus tincidunt arcu at justo <a href="#">faucibus</a>, et lacinia est accumsan. '); + $notification = new Notification('Phasellus tincidunt arcu at justo <a href="#">faucibus</a>, et lacinia est accumsan. ', true); $notification->context = Notification::CONTEXT_ERROR; Notification\Manager::notify('ExampleUI_error', $notification); |