Don't ignore $scheme for site URLs

craftcms · May 24, 2018 · c17487b · c17487b
1 parent e6e16d9
commit c17487b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -5,6 +5,7 @@
 ### Fixed
 - Fixed a PHP error that could occur when `craft\fields\Number::normalizeValue()` was called without passing an `$element` argument. ([#2913](https://github.com/craftcms/cms/issues/2913))
 - Fixed a bug where it was not possible to fetch Matrix blocks with the `relatedTo` param if a specific custom field was specified.
+- Fixed a bug where `craft\helpers\UrlHelper::url()` and `siteUrl()` were not respecting the `$scheme` argument for site URLs.
 
 ## 3.0.9 - 2018-05-22
 

diff --git a/src/helpers/UrlHelper.php b/src/helpers/UrlHelper.php
@@ -510,15 +510,15 @@ private static function _createUrl(string $path, $params, string $scheme = null,
             }
         } else if ($cpUrl) {
             $baseUrl = static::baseCpUrl();
-
-            if ($scheme !== null) {
-                // Make sure we're using the right scheme
-                $baseUrl = static::urlWithScheme($baseUrl, $scheme);
-            }
         } else {
             $baseUrl = static::baseSiteUrl();
         }
 
+        if ($scheme !== null) {
+            // Make sure we're using the right scheme
+            $baseUrl = static::urlWithScheme($baseUrl, $scheme);
+        }
+
         // Put it all together
         if (!$showScriptName || $generalConfig->usePathInfo) {
             if ($path) {