summaryrefslogtreecommitdiff
path: root/program/steps/mail/func.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-11-14 10:09:14 +0000
committeralecpl <alec@alec.pl>2010-11-14 10:09:14 +0000
commita4c970508b899fd9e467b33319d689470908a24c (patch)
tree75cd5b1166c17a70c09cbba373a942f21b396c82 /program/steps/mail/func.inc
parentef17c54e739676a73fff69fa85ea39a3a516fcab (diff)
- Re-fix handling of html entity strings in plain/text messages
Diffstat (limited to 'program/steps/mail/func.inc')
-rw-r--r--program/steps/mail/func.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 747dce529..c7498d5b1 100644
--- a/program/steps/mail/func.inc
+++ b/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);