summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorDavid Cox Jr <DaveMC08@gmail.com>2013-09-22 08:09:36 +0200
committerDavid Cox Jr <DaveMC08@gmail.com>2013-09-22 08:09:36 +0200
commit0bba6434f0ba3d6b1f677233c2e3c8f37b3195cc (patch)
tree6798fe1bef6856728b33ff0aea744e57f9eb3662 /system/core/Output.php
parent461acc4b5eee836b99466107e40d7dd59b13e12d (diff)
Fixes Issue 2637
more elegant way to make sure that the comment is not in a js string var
Diffstat (limited to 'system/core/Output.php')
-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 7c2a64d24..b5955c008 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -847,7 +847,7 @@ class CI_Output {
}
// Remove CSS comments
- $output = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!i', '', $output);
+ $output = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/(?!.*?("|\'))!i', '', $output);
// Remove Javascript inline comments
if ($has_tags === TRUE && strpos(strtolower($open_tag), 'script') !== FALSE)