Changeset 2397 in subversion

Timestamp:

Apr 17, 2009 2:47:30 AM (4 years ago)

Author:

alec

Message:

• Fix UTF-8 byte-order mark removing (#1485514)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix UTF-8 byte-order mark removing (#1485514)
 - Fix folders subscribtions on Konqueror (#1484841) 
 - Fix debug console on Konqueror and Safari

trunk/roundcubemail/program/steps/mail/func.inc

@@ -661 +661 @@
     '/<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(
@@ -670 +670 @@
     '',
     '',
-    '\\1',
+    '',
   );
   $html = preg_replace($html_search, $html_replace, $html);