From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 10 Dec 2005 13:57:29 +0000 (+0000)
Subject: oops, this error was already encoded, so back my r1.366 out, and part of
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0cc4fb0d98f02135ae9f6c4c7a0f79fc4e0070c0;p=squirrelmail.git

oops, this error was already encoded, so back my r1.366 out, and part of
Tomas' r1.429


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10453 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/ChangeLog b/ChangeLog
index 17541dee..01c6bd5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -507,7 +507,7 @@ Version 1.5.1 -- CVS
     modified to provide support of $sendmail_args. Modifications broke backwards 
     compatibility with qmail-inject workarounds.
   - Added execution error handling in Deliver_SendMail class (#1374174).
-  - Sanitized message composition error messages.
+  - Sanitized Draft folder error message in compose.
 
 Version 1.5.0 - 2 February 2004
 -------------------------------
diff --git a/src/compose.php b/src/compose.php
index b03e6867..2ed438d8 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1640,9 +1640,9 @@ function deliverMessage($composeMessage, $draft=false) {
     }
     if (!$success) {
         // $deliver->dlv_server_msg is not always server's reply
-        $msg  = htmlspecialchars($deliver->dlv_msg) . '<br />' .
-            _("Server replied:") . ' ' . htmlspecialchars($deliver->dlv_ret_nr) . ' ' .
-            htmlspecialchars($deliver->dlv_server_msg);
+        $msg  = $deliver->dlv_msg . '<br />' .
+            _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+            $deliver->dlv_server_msg;
         plain_error_message($msg, $color);
     } else {
         unset ($deliver);
diff --git a/src/read_body.php b/src/read_body.php
index eeb8d8c0..de7b9c43 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -262,9 +262,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
-        $msg  = htmlspecialchars($deliver->dlv_msg) . '<br />' .
-                _("Server replied:") . ' ' . htmlspecialchars($deliver->dlv_ret_nr . ' ' .
-                $deliver->dlv_server_msg);
+        $msg  = $deliver->dlv_msg . '<br />' .
+                _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+                $deliver->dlv_server_msg;
         require_once(SM_PATH . 'functions/display_messages.php');
         plain_error_message($msg, $color);
     } else {