Commit dcf8f450 by Paul Klimov

AssetController adjusting URLs at same line has been fixed.

parent b85142a4
...@@ -558,7 +558,7 @@ EOD; ...@@ -558,7 +558,7 @@ EOD;
return str_replace($inputUrl, $outputUrl, $fullMatch); return str_replace($inputUrl, $outputUrl, $fullMatch);
}; };
$cssContent = preg_replace_callback('/url\(["\']?([^"]*)["\']?\)/is', $callback, $cssContent); $cssContent = preg_replace_callback('/url\(["\']?([^)^"^\']*)["\']?\)/is', $callback, $cssContent);
return $cssContent; return $cssContent;
} }
......
...@@ -338,6 +338,18 @@ EOL; ...@@ -338,6 +338,18 @@ EOL;
'/test/base/path/assets/output', '/test/base/path/assets/output',
'.absolute-url-secure-class {background-image: url(https://secure.domain.com/img/image.gif);}', '.absolute-url-secure-class {background-image: url(https://secure.domain.com/img/image.gif);}',
], ],
[
"@font-face {
src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype');
}",
'/test/base/path/assets/input/css',
'/test/base/path/assets/output',
"@font-face {
src: url('../input/fonts/glyphicons-halflings-regular.eot');
src: url('../input/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype');
}",
],
]; ];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment