summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-09-24 10:16:02 +0200
committerAndrey Andreev <narf@devilix.net>2013-09-24 10:16:02 +0200
commit57ba100129c2807153d88dc4e1d423f6e6c8a9a6 (patch)
tree0dc478eb305ee6544da76dbbec50c70682720acc /system/core
parent88f41dff43e8e787ab553d86715aca130abf9e51 (diff)
parent6d917858b5ffd012bd85a0062d511d261cd6df2d (diff)
Merge pull request #2657 from DaveMC08/feature/fixes_2637
Fixes Issue #2637
Diffstat (limited to 'system/core')
-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..7a5fb66f6 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)