summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-11-20 10:29:34 +0000
committeralecpl <alec@alec.pl>2008-11-20 10:29:34 +0000
commit300fc65a461ce37999e3f0df991b24ed1b3c1bd3 (patch)
tree7d0b57759414b710f7cc48e58fa2abf65c456003 /program/steps/mail
parent322b79db06cfd0d9a0ca5c63536c36265d5ce7d2 (diff)
- Better HTML entities conversion in html2text (#1485519)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc3
-rw-r--r--program/steps/mail/sendmail.inc2
2 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d1d913b68..d4348f287 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -323,8 +323,7 @@ function rcmail_compose_header_from($attrib)
if ($a_signatures[$identity_id]['is_html'])
{
$h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
- $plainTextPart = $h2t->get_text();
- $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
+ $a_signatures[$identity_id]['plain_text'] = trim($h2t->get_text());
}
}
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 784d46a8f..7ee6dd4cc 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -265,7 +265,7 @@ if ($isHtml)
// empty message body breaks attachment handling in drafts
$plainTextPart = "\r\n";
}
- $MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));
+ $MAIL_MIME->setTXTBody($plainTextPart);
// look for "emoticon" images from TinyMCE and copy into message as attachments
rcmail_attach_emoticons($MAIL_MIME);