Prevent empty base URL during installation

Signed-off-by: Louis Chemineau <[email protected]>
nextmcloud · Sep 29, 2021 · 33685c5 · 33685c5
1 parent 610bc60
commit 33685c5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
@@ -271,7 +271,8 @@ public function linkToDocs(string $key): string {
 	 * @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;