- Fix handling HTML comments in HTML messages (#1486189)

15 years ago · bf1b66bf1d
parent 52bd7bf16e
commit bf1b66bf1d
2 changed files with 6 additions and 1 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================

+- Fix handling HTML comments in HTML messages (#1486189)
 - Fix folder/messagelist controls alignment - icons used (#1486072)
 - Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
 - Fix cache status checking + improve cache operations performance (#1486104)
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@ -892,6 +892,10 @@ function rcmail_html_tag_callback($matches)
 {
  $tagname = $matches[2];

+  // html comments (#1486189)
+  if ($matches[1] == '<!')
+    return '<!';
+    
  $tagname = preg_replace(array(
    '/:.*$/',		// Microsoft's Smart Tags <st1:xxxx>
    '/[^a-z0-9_-]/i',	// forbidden characters