From 164b45964edc699db9e049dddd91e9de07635fcd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 20 Apr 2011 09:10:51 +0000
Subject: - Apply r4667 from trunk

---
 program/lib/washtml.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/program/lib/washtml.php b/program/lib/washtml.php
index 0f8dc7ee6..e8befe835 100644
--- a/program/lib/washtml.php
+++ b/program/lib/washtml.php
@@ -273,7 +273,8 @@ class washtml
       $this->config['base_url'] = '';
 
     // Remove invalid HTML comments (#1487759)
-    $html = preg_replace('/<!--[^->]*>/', '', $html);
+    // Don't remove valid conditional comments
+    $html = preg_replace('/<!--[^->[]*>/', '', $html);
 
     @$node->loadHTML($html);
     return $this->dumpHtml($node);
-- 
cgit v1.2.3