From e7d37ae9875eb0dfcb616930869d8391a94418af Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 16 Apr 2008 03:22:35 -0400
Subject: [PATCH] - Decode entities when inserting HTML signature to plain text message (#1484990)
---
CHANGELOG | 1 +
program/steps/mail/compose.inc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0e7331c..dcb86ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
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 4c4121a..9989a82 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -241,7 +241,7 @@
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 @@
{
$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'));
}
}
--
Gitblit v1.9.1