Changeset 3046 in subversion for trunk/roundcubemail/program/steps/mail/func.inc

Timestamp:

Oct 16, 2009 12:25:10 PM (4 years ago)

Author:

alec

Message:

• fix regular expression for malformed tags handler

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (2 diffs)

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

@@ -698 +698 @@
 
   // fix (unknown/malformed) HTML tags before "wash"
-  $html = preg_replace_callback('/(<[\/!]*)([^ >]+)/', 'rcmail_html_tag_callback', $html);
+  $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html);
 
   // charset was converted to UTF-8 in rcube_imap::get_message_part(),
@@ -909 +909 @@
   $tagname = $matches[2];
 
-  // html comments (#1486189)
-  if ($matches[1] == '<!')
-    return '<!';
-    
   $tagname = preg_replace(array(
     '/:.*$/',           // Microsoft's Smart Tags <st1:xxxx>