We want the un-encoded message if we request the raw data.

diff --git a/framework/Notification/lib/Horde/Notification/Listener/Status.php b/framework/Notification/lib/Horde/Notification/Listener/Status.php
index 9fde069..f368487 100644 (file)
--- a/framework/Notification/lib/Horde/Notification/Listener/Status.php
+++ b/framework/Notification/lib/Horde/Notification/Listener/Status.php
@@ -107,12 +107,12 @@ class Horde_Notification_Listener_Status extends Horde_Notification_Listener
             }
         } else {
             $text = $event->getMessage();
-            if (!in_array('content.raw', $this->getFlags($message))) {
-                $text = htmlspecialchars($text, ENT_COMPAT, Horde_Nls::getCharset());
-            }
             if (!empty($options['data'])) {
                 $result['message'] = $text;
             }
+            if (!in_array('content.raw', $this->getFlags($message))) {
+                $text = htmlspecialchars($text, ENT_COMPAT, Horde_Nls::getCharset());
+            }
         }
 
         return empty($options['data'])