diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php index 9971274..1d0ca37 100644 --- a/framework/helpers/BaseUrl.php +++ b/framework/helpers/BaseUrl.php @@ -192,7 +192,7 @@ class BaseUrl if ($url === '') { $url = Yii::$app->getRequest()->getUrl(); - } elseif ($url[0] !== '/' && $url[0] !== '#' && strpos($url, '://') === false && strncmp($url, './', 2) !== 0) { + } elseif ($url[0] !== '/' && $url[0] !== '#' && $url[0] !== '.' && strpos($url, '://') === false) { $url = Yii::$app->getRequest()->getBaseUrl() . '/' . $url; } diff --git a/framework/web/AssetBundle.php b/framework/web/AssetBundle.php index 04e50c9..60cfac2 100644 --- a/framework/web/AssetBundle.php +++ b/framework/web/AssetBundle.php @@ -143,14 +143,14 @@ class AssetBundle extends Object public function registerAssetFiles($view) { foreach ($this->js as $js) { - if (strpos($js, '/') !== 0 && strpos($js, '://') === false) { + if ($js[0] !== '/' && $js[0] !== '.' && strpos($js, '://') === false) { $view->registerJsFile($this->baseUrl . '/' . $js, [], $this->jsOptions); } else { $view->registerJsFile($js, [], $this->jsOptions); } } foreach ($this->css as $css) { - if (strpos($css, '/') !== 0 && strpos($css, '://') === false) { + if ($css[0] !== '/' && $css[0] !== '.' && strpos($css, '://') === false) { $view->registerCssFile($this->baseUrl . '/' . $css, [], $this->cssOptions); } else { $view->registerCssFile($css, [], $this->cssOptions);