diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-16 07:22:35 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-16 07:22:35 +0000 |
| commit | 87c2074447f61e8031049f2626c6f1ce9e726f1f (patch) | |
| tree | 8dfb8501cce475136081dce82aaeeb5b2d29b50e | |
| parent | 924f84892a5e8edf46a09730fc5afb7189adbffa (diff) | |
- Decode entities when inserting HTML signature to plain text message (#1484990)
git-svn-id: https://svn.roundcube.net/trunk@1312 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 0e7331c64..dcb86ab13 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index 4c4121a35..9989a82b6 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/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')); } } |