Merge pull request bcit-ci#2657 from DaveMC08/feature/fixes_2637

narfbg · narfbg · commit 57ba100129c2 · 2013-09-24T01:16:02.000-07:00
Fixes Issue bcit-ci#2637
diff --git a/system/core/Output.php b/system/core/Output.php
@@ -847,7 +847,7 @@ protected function _minify_script_style($output, $has_tags = FALSE)
 		}
 
 		// 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)

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ protected function _minify_script_style($output, $has_tags = FALSE)`
`847`	`847`	`}`
`848`	`848`
`849`	`849`	`// Remove CSS comments`
`850`		`- $output = preg_replace('!/\[^]\+([^/][^]\+)/!i', '', $output);`
	`850`	`+ $output = preg_replace('!/\([^/][^]\)*/(?!.+?["\'])!i', '', $output);`
`851`	`851`
`852`	`852`	`// Remove Javascript inline comments`
`853`	`853`	`if ($has_tags === TRUE && strpos(strtolower($open_tag), 'script') !== FALSE)`