From b26128a56693b0e526126830581f61ac05fcde8d Mon Sep 17 00:00:00 2001
From: Joeke Kloosterman <joekekloosterman@gmail.com>
Date: Mon, 18 Jan 2016 19:50:53 +0100
Subject: [PATCH] Adding new css uri rewrite filter to minify class + fixing
 assetwriter paths

---
 .../assetic/src/Assetic/Filter/CSSUriRewriteFilter.php    | 6 ++----
 .../modxminify/model/modxminify/modxminify.class.php      | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/components/modxminify/assetic/src/Assetic/Filter/CSSUriRewriteFilter.php b/core/components/modxminify/assetic/src/Assetic/Filter/CSSUriRewriteFilter.php
index a1f9d1c..81fe3c6 100644
--- a/core/components/modxminify/assetic/src/Assetic/Filter/CSSUriRewriteFilter.php
+++ b/core/components/modxminify/assetic/src/Assetic/Filter/CSSUriRewriteFilter.php
@@ -36,11 +36,9 @@ public function filterDump(AssetInterface $asset)
 
         $content = \Minify_CSS_UriRewriter::rewrite(
             $asset->getContent()
-            ,$options['currentDir']
-            ,$options['docRoot']
-            ,$options['symlinks']
+            ,$sourceBase
         ); 
 
-        // $asset->setContent(\Minify_CSS_UriRewriter::minify($asset->getContent()));
+        $asset->setContent($content);
     }
 }
diff --git a/core/components/modxminify/model/modxminify/modxminify.class.php b/core/components/modxminify/model/modxminify/modxminify.class.php
index 76920dd..913c0fa 100644
--- a/core/components/modxminify/model/modxminify/modxminify.class.php
+++ b/core/components/modxminify/model/modxminify/modxminify.class.php
@@ -5,7 +5,7 @@
 use Assetic\Asset\AssetCollection;
 use Assetic\Asset\FileAsset;
 use Assetic\Filter\MinifyCssCompressorFilter;
-use Assetic\Filter\CssRewriteFilter;
+use Assetic\Filter\CSSUriRewriteFilter;
 use Assetic\Filter\ScssphpFilter;
 use Assetic\Filter\LessphpFilter;
 use Assetic\Filter\JSMinFilter;
@@ -96,7 +96,7 @@ public function minifyFiles($group) {
             $minifiedFiles = array();
         
             $am = new AssetManager();
-            $writer = new AssetWriter($this->options['cachePath']);
+            $writer = new AssetWriter($this->options['rootPath']);
             $allFiles = array();
             $fileDates = array();
             $updatedFiles = 0;
@@ -129,7 +129,7 @@ public function minifyFiles($group) {
                     if($fileExt == 'less') {
                         $fileFilter = array(new LessphpFilter());
                     }
-                    $minifyFilter = array(new CssRewriteFilter(), new MinifyCssCompressorFilter());
+                    $minifyFilter = array(new CSSUriRewriteFilter(), new MinifyCssCompressorFilter());
                     $filePrefix = 'styles';
                     $fileSuffix = '.min.css';
                 }
@@ -161,7 +161,7 @@ public function minifyFiles($group) {
 
                 $this->log("Writing ".$minifyFilename."\n\r");
                 $collection = new AssetCollection($allFiles,$minifyFilter);
-                $collection->setTargetPath($minifyFilename);
+                $collection->setTargetPath($this->options['cacheUrl'].'/'.$minifyFilename);
                 $am->set($group, $collection);
 
                 if($updatedFiles > 0 && $skip == 0) {