summaryrefslogtreecommitdiff
path: root/roundcubemail/program/lib
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-04-19 08:23:31 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-04-19 08:23:31 +0000
commit47dcc5411ec51b6e06fa3ae68e3fd0375b88df08 (patch)
treec41d8a930162a2e71d90124699f38e2625046948 /roundcubemail/program/lib
parent23be8a14216d427554bbb71dc19c7977c44863b7 (diff)
- Fix regression in html conditional comments handling by washtml class
git-svn-id: https://svn.roundcube.net/trunk@4667 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/lib')
-rw-r--r--roundcubemail/program/lib/washtml.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/program/lib/washtml.php b/roundcubemail/program/lib/washtml.php
index 0f8dc7ee6..e8befe835 100644
--- a/roundcubemail/program/lib/washtml.php
+++ b/roundcubemail/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);