Prevent empty base URL during installation

Signed-off-by: Louis Chemineau <louis@chmn.me>

diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
index f7fa6fa56322a7fe4c2edf3dde6cd2d8f1d884b8..511c37d26240aaf507524f56329e15ad482a8e60 100644 (file)
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -271,7 +271,8 @@ class URLGenerator implements IURLGenerator {
         * @return string base url of the current request
         */
        public function getBaseUrl(): string {
-               if ($this->baseUrl === null) {
+               // BaseUrl can be equal to 'http(s)://' during the first steps of the intial setup.
+               if ($this->baseUrl === null || $this->baseUrl === "http://" || $this->baseUrl === "https://") {
                        $this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
                }
                return $this->baseUrl;