From 09cb2b0831be1a615473320bed8260386987bc50 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 25 Nov 2009 11:27:47 +0100
Subject: [PATCH] We want the un-encoded message if we request the raw data.

---
 framework/Notification/lib/Horde/Notification/Listener/Status.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/Notification/lib/Horde/Notification/Listener/Status.php b/framework/Notification/lib/Horde/Notification/Listener/Status.php
index 9fde0690f..f368487d6 100644
--- 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'])
-- 
2.11.0