From 0426c50f8254bb4bfff6ef49ddc2a4a05264608b Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 10 Nov 2011 08:18:54 +0000
Subject: - Fix problem with parsing HTML message body with non-unicode
 characters (#1487813)

git-svn-id: https://svn.roundcube.net/trunk@5407 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/func.inc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'roundcubemail/program')

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index 39c25f19c..8407b06cd 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/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;
 
-- 
cgit v1.2.3