summaryrefslogtreecommitdiff
path: root/program/steps/mail/func.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
committeralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
commitecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce (patch)
tree2a19876b7daee9b036fbab5cc7317402b2dd0f57 /program/steps/mail/func.inc
parentc82bf6689f47073342f4c42502f75bcaf17e6130 (diff)
- Apply fixes fom trunk up to r5414
Diffstat (limited to 'program/steps/mail/func.inc')
-rw-r--r--program/steps/mail/func.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 39c25f19c..8407b06cd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -639,6 +639,9 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
if (!$p['skip_washer_style_callback'])
$washer->add_callback('style', 'rcmail_washtml_callback');
+ // Remove non-UTF8 characters (#1487813)
+ $html = rc_utf8_clean($html);
+
$html = $washer->wash($html);
$REMOTE_OBJECTS = $washer->extlinks;