Changeset e7d37ae in github

Timestamp:

Apr 16, 2008 3:22:35 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1b18b19

Parents:

f94a801

Message:

• Decode entities when inserting HTML signature to plain text message (#1484990)

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (2 diffs)

CHANGELOG

@@ -5 +5 @@
 ----------
 - Fix typo in set_charset() (#1484991)
+- Decode entities when inserting HTML signature to plain text message (#1484990)
 
 2008/04/15 (estadtherr)

program/steps/mail/compose.inc

@@ -242 +242 @@
 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
@@ -299 +299 @@
             $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'));
         }
       }