From e7d37ae9875eb0dfcb616930869d8391a94418af Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 16 Apr 2008 07:22:35 +0000 Subject: - Decode entities when inserting HTML signature to plain text message (#1484990) --- program/steps/mail/compose.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 4c4121a35..9989a82b6 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -241,7 +241,7 @@ function rcmail_compose_headers($attrib) function rcmail_compose_header_from($attrib) { - global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode; + global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $CONFIG, $compose_mode; // pass the following attributes to the form class $field_attrib = array('name' => '_from'); @@ -298,7 +298,7 @@ function rcmail_compose_header_from($attrib) { $h2t = new html2text($a_signatures[$identity_id]['text'], false, false); $plainTextPart = $h2t->get_text(); - $a_signatures[$identity_id]['plain_text'] = trim($plainTextPart); + $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8')); } } -- cgit v1.2.3