Merge branch 'master' of github.com:crunchbutton/crunchbutton

This commit is contained in:
arzynik 2012-12-03 18:39:57 -05:00
commit 08eda1d783

View File

@ -26,7 +26,7 @@ class Controller_assets_css_bundle_css extends Crunchbutton_Controller_AssetBund
$css = c::cache()->read($cache); $css = c::cache()->read($cache);
$mtime = c::cache()->mtime($cache); $mtime = c::cache()->mtime($cache);
} else { } else {
$css = preg_replace_callback('/url\(([a-z0-9\/\-_\.]+)\)/i',$callback, $css); //$css = preg_replace_callback('/url\(([a-z0-9\/\-_\.]+)\)/i',$callback, $css);
$css = preg_replace('/\t|\n/','',$css); $css = preg_replace('/\t|\n/','',$css);
$mtime = filemtime($file); $mtime = filemtime($file);