From b6ec6085fe84a218ae101609a02b93cbdd76eb19 Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Sun, 26 May 2013 20:59:03 +0300 Subject: [PATCH] Method "AssetController::adjustCssUrl()" has been complete. --- framework/yii/console/controllers/AssetController.php | 2 +- .../framework/console/controllers/AssetControllerTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/yii/console/controllers/AssetController.php b/framework/yii/console/controllers/AssetController.php index 249938f..1bd8e10 100644 --- a/framework/yii/console/controllers/AssetController.php +++ b/framework/yii/console/controllers/AssetController.php @@ -579,7 +579,7 @@ EOD return str_replace($inputUrl, $outputUrl, $fullMatch); }; - $cssContent = preg_replace_callback('/[\w\-]:\s*url\("([^"]*)"\)+/is', $callback, $cssContent); + $cssContent = preg_replace_callback('/url\(["\']?([^"]*)["\']?\)/is', $callback, $cssContent); return $cssContent; } diff --git a/tests/unit/framework/console/controllers/AssetControllerTest.php b/tests/unit/framework/console/controllers/AssetControllerTest.php index 4f25fe6..a76a942 100644 --- a/tests/unit/framework/console/controllers/AssetControllerTest.php +++ b/tests/unit/framework/console/controllers/AssetControllerTest.php @@ -263,22 +263,22 @@ class AssetControllerTest extends TestCase { return array( array( - '.published-same-dir-class {background-image: url("published_same_dir.png");}', + '.published-same-dir-class {background-image: url(published_same_dir.png);}', '/test/base/path/assets/input', '/test/base/path/assets/output', - '.published-same-dir-class {background-image: url("../input/published_same_dir.png");}', + '.published-same-dir-class {background-image: url(../input/published_same_dir.png);}', ), array( - '.published-relative-dir-class {background-image: url("../img/published_relative_dir.png");}', + '.published-relative-dir-class {background-image: url(../img/published_relative_dir.png);}', '/test/base/path/assets/input', '/test/base/path/assets/output', - '.published-relative-dir-class {background-image: url("../img/published_relative_dir.png");}', + '.published-relative-dir-class {background-image: url(../img/published_relative_dir.png);}', ), array( - '.static-same-dir-class {background-image: url("static_same_dir.png");}', + '.static-same-dir-class {background-image: url(\'static_same_dir.png\');}', '/test/base/path/css', '/test/base/path/assets/output', - '.static-same-dir-class {background-image: url("../../css/static_same_dir.png");}', + '.static-same-dir-class {background-image: url(\'../../css/static_same_dir.png\');}', ), array( '.static-relative-dir-class {background-image: url("../img/static_relative_dir.png");}',