diff options
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | program/steps/mail/compose.inc | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail 2008/04/16 (alec) ---------- - Fix typo in set_charset() (#1484991) +- Decode entities when inserting HTML signature to plain text message (#1484990) 2008/04/15 (estadtherr) ---------- 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')); } } |