From d6bd2e6d2e2a690cbac0401d6e57435c93f91f33 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 17 Apr 2009 06:47:30 +0000 Subject: - Fix UTF-8 byte-order mark removing (#1485514) git-svn-id: https://svn.roundcube.net/trunk@2397 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/steps/mail/func.inc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 0e0dce25e..f04e628ab 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix UTF-8 byte-order mark removing (#1485514) - Fix folders subscribtions on Konqueror (#1484841) - Fix debug console on Konqueror and Safari - Fix messagelist focus issue when modifying status of selected messages (#1485807) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index f9d560a97..8931cfa4e 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -660,7 +660,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) '/.*<\/title>/i', // PHP bug #32547 workaround: remove title tag '/<html[^>]*>/im', // malformed html: remove html tags (#1485139) '/<\/html>/i', // malformed html: remove html tags (#1485139) - '/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im', // remove byte-order mark (only outlook?) + '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/', // byte-order mark (only outlook?) ); $html_replace = array( '\\1'.'   '.'\\3', @@ -669,7 +669,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) '', '', '', - '\\1', + '', ); $html = preg_replace($html_search, $html_replace, $html); -- cgit v1.2.3