Skip to content

Y
yii2
Commit 264cf81e by Paul Klimov
Options

Merge pull request #3231 from mikehaertl/fix-assetbundle

Fix call to AssetConverter::convert() in AssetBundle
parents 904c32eb 1e3989e5
Showing with 2 additions and 2 deletions
framework/web/AssetBundle.php
...@@ -173,7 +173,7 @@ class AssetBundle extends Object ...@@ -173,7 +173,7 @@ class AssetBundle extends Object
foreach ($this->js as $i => $js) { foreach ($this->js as $i => $js) {
if (strpos($js, '/') !== 0 && strpos($js, '://') === false) { if (strpos($js, '/') !== 0 && strpos($js, '://') === false) {
if (isset($this->basePath, $this->baseUrl)) { if (isset($this->basePath, $this->baseUrl)) {
$this->js[$i] = $converter->convert($js, $this->basePath, $this->baseUrl); $this->js[$i] = $converter->convert($js, $this->basePath);
} else { } else {
$this->js[$i] = '/' . $js; $this->js[$i] = '/' . $js;
} }
...@@ -182,7 +182,7 @@ class AssetBundle extends Object ...@@ -182,7 +182,7 @@ class AssetBundle extends Object
foreach ($this->css as $i => $css) { foreach ($this->css as $i => $css) {
if (strpos($css, '/') !== 0 && strpos($css, '://') === false) { if (strpos($css, '/') !== 0 && strpos($css, '://') === false) {
if (isset($this->basePath, $this->baseUrl)) { if (isset($this->basePath, $this->baseUrl)) {
$this->css[$i] = $converter->convert($css, $this->basePath, $this->baseUrl); $this->css[$i] = $converter->convert($css, $this->basePath);
} else { } else {
$this->css[$i] = '/' . $css; $this->css[$i] = '/' . $css;
} }
......
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