From f0261cee4b9e1352139c4afee8e50a342e37f3f7 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 30 Sep 2009 18:06:41 +0000
Subject: - Fix handling HTML comments in HTML messages (#1486189)

git-svn-id: https://svn.roundcube.net/trunk@3002 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/func.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/steps')

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index 35354eb28..0f835e9ae 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -734,7 +734,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
 
   // allow CSS styles, will be sanitized by rcmail_washtml_callback()
   $washer->add_callback('style', 'rcmail_washtml_callback');
-    
+
   $html = $washer->wash($html);
   $REMOTE_OBJECTS = $washer->extlinks;
   
@@ -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
-- 
cgit v1.2.3