fix #17191: improved consistency and readability of UrlManager::creat…

…eAbsoluteUrl(, ) method
yiisoft · Dec 25, 2023 · ff01ff8 · ff01ff8
1 parent cdaf6f5
commit ff01ff8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
 2.0.50 under development
 ------------------------
 
-- Bug #17191: Fixed `UrlManager::createUrl($params)` method now relies on `BaseUrl::isRelative($url)` method (ggh2e3)
+- Bug #17191: Fix `UrlManager::createUrl($params)`, `UrlManager::createAbsoluteUrl($params, $scheme)` methods to rely on `BaseUrl::isRelative($url)` method (ggh2e3)
 - Bug #17191: Fixed `BaseUrl::isRelative($url)` method in `yii\helpers\BaseUrl` (ggh2e3)
 - Bug #18469: Fixed `Link::serialize(array $links)` method in `yii\web\Link` (ggh2e3)
 - Bug #20040: Fix type `boolean` in `MSSQL` (terabytesoftw)

diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
@@ -553,13 +553,12 @@ public function createAbsoluteUrl($params, $scheme = null)
     {
         $params = (array) $params;
         $url = $this->createUrl($params);
-        if (strpos($url, '://') === false) {
-            $hostInfo = $this->getHostInfo();
-            if (strncmp($url, '//', 2) === 0) {
-                $url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
-            } else {
-                $url = $hostInfo . $url;
-            }
+        $hostInfo = $this->getHostInfo();
+        if (Url::isRelative($url)) {
+            $url = $hostInfo . $url;
+        }
+        if (strncmp($url, '//', 2) === 0) {
+            $url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
         }
 
         return Url::ensureScheme($url, $scheme);