Merge pull request #7353 from kenjis/fix-site-url-protocol-relative-link

fix: site_url() does not support protocol-relative links

Author: kenjis

system/Helpers/url_helper.php

@@ -117,13 +117,20 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
     {
         $uri = _get_uri($relativePath, $config);
 
-        return URI::createURIString(
+        $uriString = URI::createURIString(
             $scheme ?? $uri->getScheme(),
             $uri->getAuthority(),
             $uri->getPath(),
             $uri->getQuery(),
             $uri->getFragment()
         );
+
+        // For protocol-relative links
+        if ($scheme === '') {
+            $uriString = '//' . $uriString;
+        }
+
+        return $uriString;
     }
 }
 

tests/system/Helpers/URLHelper/SiteUrlTest.php

@@ -304,7 +304,21 @@ public function configProvider()
         ];
     }
 
-    // base_url
+    public function testSiteURLWithEmptyStringScheme()
+    {
+        $this->config->baseURL                   = 'http://example.com/';
+        $this->config->indexPage                 = 'index.php';
+        $this->config->forceGlobalSecureRequests = false;
+
+        $this->assertSame(
+            '//example.com/index.php/test',
+            site_url('test', '', $this->config)
+        );
+        $this->assertSame(
+            '//example.com/img/test.jpg',
+            base_url('img/test.jpg', '')
+        );
+    }
 
     /**
      * These tests are only really relevant to show that base_url()