Version 3.4.5

upload/public/min/lib/Minify/CSS.php

@@ -26,6 +26,8 @@ class Minify_CSS {
      * 'preserveComments': (default true) multi-line comments that begin
      * with "/*!" will be preserved with newlines before and after to
      * enhance readability.
+     *
+     * 'removeCharsets': (default true) remove all @charset at-rules
      * 
      * 'prependRelativePath': (default null) if given, this string will be
      * prepended to all relative URIs in import/url declarations
@@ -36,42 +38,56 @@ class Minify_CSS {
      * the desired files. For this to work, the files *must* exist and be
      * visible by the PHP process.
      *
-     * 'symlinks': (default = array()) If the CSS file is stored in 
-     * a symlink-ed directory, provide an array of link paths to
-     * target paths, where the link paths are within the document root. Because 
-     * paths need to be normalized for this to work, use "//" to substitute 
-     * the doc root in the link paths (the array keys). E.g.:
-     * <code>
-     * array('//symlink' => '/real/target/path') // unix
-     * array('//static' => 'D:\\staticStorage')  // Windows
+     * 'symlinks': (default = array()) If the CSS file is stored in 
+     * a symlink-ed directory, provide an array of link paths to
+     * target paths, where the link paths are within the document root. Because 
+     * paths need to be normalized for this to work, use "//" to substitute 
+     * the doc root in the link paths (the array keys). E.g.:
+     * <code>
+     * array('//symlink' => '/real/target/path') // unix
+     * array('//static' => 'D:\\staticStorage')  // Windows
      * </code>
+     *
+     * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])
+     * see Minify_CSS_UriRewriter::rewrite
      * 
      * @return string
      */
     public static function minify($css, $options = array()) 
     {
-        require_once 'Minify/CSS/Compressor.php';/*noLibHook*/
-        if (isset($options['preserveComments']) 
-            && !$options['preserveComments']) {
+        $options = array_merge(array(
+            'removeCharsets' => true,
+            'preserveComments' => true,
+            'currentDir' => null,
+            'docRoot' => $_SERVER['DOCUMENT_ROOT'],
+            'prependRelativePath' => null,
+            'symlinks' => array(),
+        ), $options);
+        
+        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';/*noLibHook*/
+            require_once 'Minify/CommentPreserver.php';
             $css = Minify_CommentPreserver::process(
                 $css
                 ,array('Minify_CSS_Compressor', 'process')
                 ,array($options)
             );
         }
-        if (! isset($options['currentDir']) && ! isset($options['prependRelativePath'])) {
+        if (! $options['currentDir'] && ! $options['prependRelativePath']) {
             return $css;
         }
-        require_once 'Minify/CSS/UriRewriter.php';/*noLibHook*/
-        if (isset($options['currentDir'])) {
+        require_once 'Minify/CSS/UriRewriter.php';
+        if ($options['currentDir']) {
             return Minify_CSS_UriRewriter::rewrite(
                 $css
                 ,$options['currentDir']
-                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
-                ,isset($options['symlinks']) ? $options['symlinks'] : array()
+                ,$options['docRoot']
+                ,$options['symlinks']
             );  
         } else {
             return Minify_CSS_UriRewriter::prepend(