Changeset f96ffde in github

Timestamp:

Dec 9, 2009 4:22:32 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

8abe548

Parents:

e5d60d6

Message:

• Fix parsing conditional comments in HTML messages (#1486350)

Files:

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

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix parsing conditional comments in HTML messages (#1486350)
 - Use built-in json_encode() for proper JSON format in AJAX replies
 - Allow setting only selected params in 'message_compose' hook (#1486312)

program/steps/mail/func.inc

@@ -609 +609 @@
 }
 
+
 function rcmail_get_mailbox_name_text()
 {
@@ -631 +632 @@
   return $unseen;
 }
-                              
+
 
 /**
@@ -660 +661 @@
   }
 }
+
 
 /**
@@ -792 +794 @@
 }
 
+
 /**
  * Handle links and citation marks in plain text message
@@ -903 +906 @@
 
   $tagname = preg_replace(array(
-    '/:.*$/',           // Microsoft's Smart Tags <st1:xxxx>
-    '/[^a-z0-9_-]/i',   // forbidden characters
+    '/:.*$/',                   // Microsoft's Smart Tags <st1:xxxx>
+    '/[^a-z0-9_\[\]\!-]/i',     // forbidden characters
     ), '', $tagname);