diff options
| author | alecpl <alec@alec.pl> | 2009-04-17 06:47:30 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-04-17 06:47:30 +0000 |
| commit | 3bde305e77195ce1655fe66f9911cfc57a8e4021 (patch) | |
| tree | b5635dda9022af86130ae9995a5c4f45bdf5751a | |
| parent | 40d7c23c85d0869c81b2a2552f69b7610bde8470 (diff) | |
- Fix UTF-8 byte-order mark removing (#1485514)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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/program/steps/mail/func.inc b/program/steps/mail/func.inc index f9d560a97..8931cfa4e 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -660,7 +660,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) '/<title>.*<\/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); |