From c25b8f01c560ca97ca8a9dc217b495966aaa4d7f Mon Sep 17 00:00:00 2001 From: Jano Slota Date: Mon, 5 May 2014 22:55:36 +0200 Subject: Updated minify, jQuery, MixItUp and Tooltipster --- inc/lib/minify/Minify/CSS.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'inc/lib/minify/Minify/CSS.php') diff --git a/inc/lib/minify/Minify/CSS.php b/inc/lib/minify/Minify/CSS.php index 49882e9d..32414551 100755 --- a/inc/lib/minify/Minify/CSS.php +++ b/inc/lib/minify/Minify/CSS.php @@ -56,6 +56,7 @@ class Minify_CSS { public static function minify($css, $options = array()) { $options = array_merge(array( + 'compress' => true, 'removeCharsets' => true, 'preserveComments' => true, 'currentDir' => null, @@ -67,21 +68,20 @@ class Minify_CSS { if ($options['removeCharsets']) { $css = preg_replace('/@charset[^;]+;\\s*/', '', $css); } - require_once 'Minify/CSS/Compressor.php'; - if (! $options['preserveComments']) { - $css = Minify_CSS_Compressor::process($css, $options); - } else { - require_once 'Minify/CommentPreserver.php'; - $css = Minify_CommentPreserver::process( - $css - ,array('Minify_CSS_Compressor', 'process') - ,array($options) - ); + if ($options['compress']) { + if (! $options['preserveComments']) { + $css = Minify_CSS_Compressor::process($css, $options); + } else { + $css = Minify_CommentPreserver::process( + $css + ,array('Minify_CSS_Compressor', 'process') + ,array($options) + ); + } } if (! $options['currentDir'] && ! $options['prependRelativePath']) { return $css; } - require_once 'Minify/CSS/UriRewriter.php'; if ($options['currentDir']) { return Minify_CSS_UriRewriter::rewrite( $css -- cgit v1.3