Merge pull request #2120 from mikezilla/develop
Fix MSIE conditionals regex in minify output
diff --git a/system/core/Output.php b/system/core/Output.php
index ce0500e..27e7117 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -739,7 +739,7 @@
$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);