Changeset 4667 in subversion

Timestamp:

Apr 19, 2011 4:23:31 AM (2 years ago)

Author:

alec

Message:

• Fix regression in html conditional comments handling by washtml class

Location:

trunk/roundcubemail

Files:

• program/lib/washtml.php (modified) (1 diff)
• tests/mailfunc.php (modified) (2 diffs)
• tests/src/htmlcom.txt (added)

trunk/roundcubemail/program/lib/washtml.php

@@ -274 +274 @@
 
     // Remove invalid HTML comments (#1487759)
-    $html = preg_replace('/<!--[^->]*>/', '', $html);
+    // Don't remove valid conditional comments
+    $html = preg_replace('/<!--[^->[]*>/', '', $html);
 
     @$node->loadHTML($html);

trunk/roundcubemail/tests/mailfunc.php

@@ -122 +122 @@
   {
     $part = $this->get_html_part('src/mailto.txt');
-    
+
     // render HTML in normal mode
     $html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');
@@ -132 +132 @@
   }
 
+  /**
+   * Test the elimination of HTML comments
+   */
+  function test_html_comments()
+  {
+    $part = $this->get_html_part('src/htmlcom.txt');
+    $washed = rcmail_print_body($part, array('safe' => true));
+
+    // #1487759
+    $this->assertPattern('|<p>test1</p>|', $washed, "Buggy HTML comments");
+    // but conditional comments (<!--[if ...) should be removed
+    $this->assertNoPattern('|<p>test2</p>|', $washed, "Conditional HTML comments");
+  }
+
 }