[Svn] r2878 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Thu Aug 27 10:09:00 CEST 2009


Author: thomasb
Date: 2009-08-27 03:09:00 -0500 (Thu, 27 Aug 2009)
New Revision: 2878

Modified:
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
Strip xmlns attributes from html tag

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2009-08-27 08:08:27 UTC (rev 2877)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2009-08-27 08:09:00 UTC (rev 2878)
@@ -676,11 +676,13 @@
     '/(<\/nobr>)(\s+)(<nobr>)/i',	// space(s) between <NOBR>
     '/<title>.*<\/title>/i',		// PHP bug #32547 workaround: remove title tag
     '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',	// byte-order mark (only outlook?)
+    '/<html\sxmlns:[a-z]=[^>]+>/i',  // washtml/DOMDocument cannot handle xml namespaces
   );
   $html_replace = array(
     '\\1'.'   '.'\\3',
     '',
     '',
+    '<html>',
   );
   $html = preg_replace($html_search, $html_replace, $html);
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list