From 1f69dcb593f2c282c2eab9f9327b84aad50f5a23 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 3 Dec 2015 14:42:14 +0100
Subject: [PATCH] Use URLGenerator instead of hard-coded WEBROOT
Fixes https://github.com/owncloud/core/issues/20922
---
lib/base.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index ed397d6a0e8..038c259ecf6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -898,7 +898,7 @@ class OC {
// this is needed to prevent "Token expired" messages while login if a session is expired
// @see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
if(isset($_GET['logout']) && !OC_User::isLoggedIn()) {
- header("Location: " . OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
+ header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/'));
return;
}
@@ -914,7 +914,7 @@ class OC {
}
OC_User::logout();
// redirect to webroot and add slash if webroot is empty
- header("Location: " . OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
+ header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/'));
} else {
// Redirect to default application
OC_Util::redirectToDefaultPage();
--
GitLab