summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-06 03:38:16 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-06 03:38:16 +0100
commit85adeed0ab67bcde7b5c57ddb44022c75e82078a (patch)
tree5c905de01b179a4636556542b5e4c4fa6a997efe /system
parent828f4c9d9ace922f5135742170d489d811548b04 (diff)
parent4d02e356cadd9af49c915c76b7cd27d01e67edb8 (diff)
Merge pull request #2120 from mikezilla/develop
Fix MSIE conditionals regex in minify output
Diffstat (limited to 'system')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index ce0500e71..27e711783 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -739,7 +739,7 @@ class CI_Output {
$output = preg_replace('!\s{2,}!', ' ', $output);
// Remove comments (non-MSIE conditionals)
- $output = preg_replace('{\s*<!--[^\[].*-->\s*}msU', '', $output);
+ $output = preg_replace('{\s*<!--[^\[<>].*(?<!!)-->\s*}msU', '', $output);
// Remove spaces around block-level elements.
$output = preg_replace('/\s*(<\/?(html|head|title|meta|script|link|style|body|h[1-6]|div|p|br)[^>]*>)\s*/is', '$1', $output);