From e9849270e3b9a15b6694f78c7bca33bbed603888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 6 Sep 2013 00:28:13 +0200
Subject: [PATCH] Revert "fixes #4574"
This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.
---
lib/base.php | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index fe160f7365..ea5adbadc9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -826,16 +826,11 @@ class OC {
) {
return false;
}
- // don't redo authentication if user is already logged in
- // otherwise session would be invalidated in OC_User::login with
- // session_regenerate_id at every page load
- if (!OC_User::isLoggedIn()) {
- OC_App::loadApps(array('authentication'));
- if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
- //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
- OC_User::unsetMagicInCookie();
- $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
- }
+ OC_App::loadApps(array('authentication'));
+ if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+ //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+ OC_User::unsetMagicInCookie();
+ $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
}
return true;
}
--
GitLab