Merge pull request #169 from royduin/patch-1

Fixed the CSS merging data uri bug

Author: colinmollenhour

app/code/core/Mage/Core/Model/Design/Package.php

@@ -781,7 +781,7 @@ public function beforeMergeCss($file, $contents)
        $cssImport = '/@import\\s+([\'"])(.*?)[\'"]/';
        $contents = preg_replace_callback($cssImport, array($this, '_cssMergerImportCallback'), $contents);
 
-       $cssUrl = '/url\\(\\s*(?!data:)([^\\)\\s]+)\\s*\\)?/';
+       $cssUrl = '/url\\(\\s*(?![\\\'\\"]?data:)([^\\)\\s]+)\\s*\\)?/';
        $contents = preg_replace_callback($cssUrl, array($this, '_cssMergerUrlCallback'), $contents);
 
        return $contents;