From 335800947b3102456ddcb672b5d95026517b5152 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sun, 30 Sep 2012 18:44:17 -0400
Subject: [PATCH] Fixes #271: Allows URI rewriting when handling pre-minified
 files

---
 min/lib/Minify/CSS.php               | 19 +++++++++++--------
 min/lib/Minify/Controller/MinApp.php |  9 ++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/min/lib/Minify/CSS.php b/min/lib/Minify/CSS.php
index 5be3241..3241455 100644
--- a/min/lib/Minify/CSS.php
+++ b/min/lib/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,14 +68,16 @@ class Minify_CSS {
         if ($options['removeCharsets']) {
             $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);
         }
-        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['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;
diff --git a/min/lib/Minify/Controller/MinApp.php b/min/lib/Minify/Controller/MinApp.php
index 45f1ac9..90268df 100644
--- a/min/lib/Minify/Controller/MinApp.php
+++ b/min/lib/Minify/Controller/MinApp.php
@@ -202,9 +202,12 @@ class Minify_Controller_MinApp extends Minify_Controller_Base {
     protected function _getFileSource($file, $cOptions)
     {
         $spec['filepath'] = $file;
-        if ($cOptions['noMinPattern']
-            && preg_match($cOptions['noMinPattern'], basename($file))) {
-            $spec['minifier'] = '';
+        if ($cOptions['noMinPattern'] && preg_match($cOptions['noMinPattern'], basename($file))) {
+            if (preg_match('~\.css$~i', $file)) {
+                $spec['minifyOptions']['compress'] = false;
+            } else {
+                $spec['minifier'] = '';
+            }
         }
         return new Minify_Source($spec);
     }