From efea86870473da5a2cdc867e171562525266c663 Mon Sep 17 00:00:00 2001 From: Florian Scholz Date: Mon, 17 Jun 2013 14:21:53 +0200 Subject: [PATCH 1/2] - removed slash-adding for logout-header-redirect --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index a6e4a47dbf5..ff9dd1ad1eb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -641,7 +641,7 @@ class OC { OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); } OC_User::logout(); - header("Location: " . OC::$WEBROOT . '/'); + header("Location: " . OC::$WEBROOT); } else { if (is_null($file)) { $param['file'] = 'index.php'; From b1fd9b39074f46b635d66c80d63994ffc99bf286 Mon Sep 17 00:00:00 2001 From: Florian Scholz Date: Tue, 25 Jun 2013 10:45:37 +0200 Subject: [PATCH 2/2] - add slash if webroot is an empty string - added comment --- lib/base.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index ff9dd1ad1eb..39e0249477b 100644 --- a/lib/base.php +++ b/lib/base.php @@ -641,7 +641,8 @@ class OC { OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); } OC_User::logout(); - header("Location: " . OC::$WEBROOT); + // redirect to webroot and add slash if webroot is empty + header("Location: " . OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : '')); } else { if (is_null($file)) { $param['file'] = 'index.php';