php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regression in View::registerJsFile, View::registerCssFile

Browse Source 
Closes #12544
This commit is contained in:
SilverFire - Dmitry Naumenko
2016-09-15 21:23:15 +03:00
parent 770c96b7c9
commit 9931324e48
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/web/View.php
View File

@ -401,7 +401,11 @@ class View extends \yii\base\View
$depends = ArrayHelper::remove($options, 'depends', []); $depends = ArrayHelper::remove($options, 'depends', []);
$url = str_replace(Yii::getAlias('@web'), '', $url); $webAlias = Yii::getAlias('@web');
if ($webAlias !== '' && strpos($url, $webAlias) === 0) {
$url = str_replace($webAlias, '', $url);
}
$url = strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/'); $url = strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/');
/** @var AssetBundle $bundle */ /** @var AssetBundle $bundle */
@ -476,7 +480,11 @@ class View extends \yii\base\View
$depends = ArrayHelper::remove($options, 'depends', []); $depends = ArrayHelper::remove($options, 'depends', []);
$url = str_replace(Yii::getAlias('@web'), '', $url); $webAlias = Yii::getAlias('@web');
if ($webAlias !== '' && strpos($url, $webAlias) === 0) {
$url = str_replace($webAlias, '', $url);
}
$url = strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/'); $url = strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/');
/** @var AssetBundle $bundle */ /** @var AssetBundle $bundle */

14
tests/framework/web/AssetBundleTest.php
View File

@ -407,14 +407,24 @@ EOF;
], ],
// Custom `@web` aliases // Custom `@web` aliases
[
'js', '@web/assetSources/js/missing-file1.js', true,
'123<script src="/backend/assetSources/js/missing-file1.js"></script>4',
'/backend'
],
[ [
'js', '@web/assetSources/js/jquery.js', true, 'js', '@web/assetSources/js/jquery.js', true,
'123<script src="/backend/assetSources/js/jquery.js\?v=\d{10}"></script>4', '123<script src="/backend/assetSources/js/jquery.js\?v=\d{10}"></script>4',
'/backend' '/backend'
], ],
[ [
'js', '@web/assetSources/js/missing-file.js', true, 'js', 'http://full-url.example.com/backend/assetSources/js/missing-file.js', true,
'123<script src="/backend/assetSources/js/missing-file.js"></script>4', '123<script src="http://full-url.example.com/backend/assetSources/js/missing-file.js"></script>4',
'/backend'
],
[
'css', '//backend/backend/assetSources/js/missing-file.js', true,
'1<link href="//backend/backend/assetSources/js/missing-file.js" rel="stylesheet">234',
'/backend' '/backend'
], ],
[ [