From e688b77125151dbbd2028f269533189fdad64904 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 14 Nov 2010 10:09:14 +0000
Subject: - Re-fix handling of html entity strings in plain/text messages

git-svn-id: https://svn.roundcube.net/trunk@4222 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/func.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/steps')

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index 747dce529..c7498d5b1 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -831,8 +831,12 @@ function rcmail_plain_body($body, $flowed=false)
     $quote_level = $q;
   }
 
-  // quote plain text
-  $body = Q(join("\n", $a_lines), 'dummy', false);
+  $body = join("\n", $a_lines);
+
+  // quote plain text (don't use Q() here, to display entities "as is")
+  $table = get_html_translation_table(HTML_SPECIALCHARS);
+  unset($table['?']);
+  $body = strtr($body, $table);
 
   // colorize signature (up to <sig_max_lines> lines)
   $len = strlen($body);
-- 
cgit v1.2.3