Browse Source

Fixed bug in AssetBundle::registerAssets().

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
40cb5b813e
  1. 12
      framework/yii/web/AssetBundle.php

12
framework/yii/web/AssetBundle.php

@ -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);
} }
} }
} }

Loading…
Cancel
Save