Skip to content

Y
yii2
Commit 40cb5b81 by Qiang Xue
Options

Fixed bug in AssetBundle::registerAssets().

parent f4e3edb1
Showing with 6 additions and 6 deletions
framework/yii/web/AssetBundle.php
...@@ -139,17 +139,17 @@ class AssetBundle extends Object ...@@ -139,17 +139,17 @@ class AssetBundle extends Object
public function registerAssets($view) public function registerAssets($view)
{ {
foreach ($this->js as $js) { foreach ($this->js as $js) {
if ($js[0] === '/') { if (strpos($js, '/') !== 0 && strpos($js, '://') === false) {
$view->registerJsFile($this->baseUrl . $js, $this->jsOptions);
} else {
$view->registerJsFile($this->baseUrl . '/' . $js, $this->jsOptions); $view->registerJsFile($this->baseUrl . '/' . $js, $this->jsOptions);
} else {
$view->registerJsFile($js, $this->jsOptions);
} }
} }
foreach ($this->css as $css) { foreach ($this->css as $css) {
if ($css[0] === '/') { if (strpos($css, '/') !== 0 && strpos($css, '://') === false) {
$view->registerCssFile($this->baseUrl . $css, $this->cssOptions);
} else {
$view->registerCssFile($this->baseUrl . '/' . $css, $this->cssOptions); $view->registerCssFile($this->baseUrl . '/' . $css, $this->cssOptions);
} else {
$view->registerCssFile($css, $this->cssOptions);
} }
} }
} }
......
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