Merge pull request #1 from boekkooi/rel-subdir

Fixed a problem when getSourcePath can contain a directory
alexandresalome · Feb 2, 2014 · 19a0aa3 · 19a0aa3
2 parents d8bb406 + 67697c6
commit 19a0aa3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Assetic/Util/PathUtils.php b/Assetic/Util/PathUtils.php
@@ -57,7 +57,7 @@ public static function resolveUrl(AssetInterface $asset, $url)
             return $url;
         }
 
-        $root = $asset->getSourceRoot();
+        $root = dirname($asset->getSourceRoot().'/'.$asset->getSourcePath());
         $path = dirname($asset->getTargetPath());
 
         if ('.' === $path) {
@@ -67,7 +67,7 @@ public static function resolveUrl(AssetInterface $asset, $url)
         }
 
         if (null !== $root) {
-            $image = $root.'/'.$image;
+            $image = $root.'/'.$url;
         }
 
         // cleanup local URLs