summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-22 09:35:47 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-22 09:37:03 +0100
commitda595a50278bf45076739ecef2e6af0e32410060 (patch)
tree9f271d513fe46491e1dba64ef4d5fb97450d182a /program/lib
parentffa0c53236e14caefdbd0629976ed8b69806e6fb (diff)
Fix handling of some conditional comment tags in HTML message (#1489004)
Conflicts: CHANGELOG
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_washtml.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
index 2a261419f..27dff9f48 100644
--- a/program/lib/Roundcube/rcube_washtml.php
+++ b/program/lib/Roundcube/rcube_washtml.php
@@ -413,7 +413,8 @@ class rcube_washtml
// Remove invalid HTML comments (#1487759)
// Don't remove valid conditional comments
- $html = preg_replace('/<!--[^->[\n]*>/', '', $html);
+ // Don't remove MSOutlook (<!-->) conditional comments (#1489004)
+ $html = preg_replace('/<!--[^->\[\n]+>/', '', $html);
// turn relative into absolute urls
$html = self::resolve_base($html);