Fix for Bug #111032 - backslashes appear before quotes after adding attachments....

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

diff --git a/src/compose.php b/src/compose.php
index e77b3a87a6c7ea4ccd84477a3e932f240fddce04..189c572537908a8eb5fecbe3ba62035d90494822 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -138,7 +138,7 @@
          $attachments, $subject, $newmail, $use_javascript_addr_book,
          $send_to_bcc, $reply_id, $mailbox;
 
-      $subject = decodeHeader($subject);
+      $subject = sqStripSlashes(decodeHeader($subject));
       $reply_subj = decodeHeader($reply_subj);
       $forward_subj = decodeHeader($forward_subj);
 
@@ -234,9 +234,9 @@
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=3>\n";
       echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
       if ($use_signature == true && $newmail == true) {
-        echo htmlspecialchars($body) . "\n\n-- \n" . htmlspecialchars($signature);
+        echo sqStripSlashes(htmlspecialchars($body)) . "\n\n-- \n" . htmlspecialchars($signature);
       } else {
-        echo htmlspecialchars($body);
+        echo sqStripSlashes(htmlspecialchars($body));
       }
       echo "</TEXTAREA><BR>\n";
       echo "      </TD>\n";