diff options
Diffstat (limited to 'inc/lib/minify/Minify/Lines.php')
| -rwxr-xr-x | inc/lib/minify/Minify/Lines.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/inc/lib/minify/Minify/Lines.php b/inc/lib/minify/Minify/Lines.php index ca8afa1b..e999a6c2 100755 --- a/inc/lib/minify/Minify/Lines.php +++ b/inc/lib/minify/Minify/Lines.php @@ -55,7 +55,11 @@ class Minify_Lines { $newLines = array(); while (null !== ($line = array_shift($lines))) { if (('' !== $id) && (0 == $i % 50)) { - array_push($newLines, '', "/* {$id} */", ''); + if ($inComment) { + array_push($newLines, '', "/* {$id} *|", ''); + } else { + array_push($newLines, '', "/* {$id} */", ''); + } } ++$i; $newLines[] = self::_addNote($line, $i, $inComment, $padTo); @@ -65,7 +69,6 @@ class Minify_Lines { // check for desired URI rewriting if (isset($options['currentDir'])) { - require_once 'Minify/CSS/UriRewriter.php'; Minify_CSS_UriRewriter::$debugText = ''; $content = Minify_CSS_UriRewriter::rewrite( $content @@ -93,6 +96,9 @@ class Minify_Lines { */ private static function _eolInComment($line, $inComment) { + // crude way to avoid things like // */ + $line = preg_replace('~//.*?(\\*/|/\\*).*~', '', $line); + while (strlen($line)) { $search = $inComment ? '*/' |