diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-06 00:28:13 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-06 00:28:13 +0200 |
| commit | e9849270e3b9a15b6694f78c7bca33bbed603888 (patch) | |
| tree | c4744cbe0ed3982000c7557144e51d1da2f9ed73 /lib/base.php | |
| parent | 4629d6ad67349f7dc596002ec062cd629a3d4dac (diff) | |
| download | nextcloud-server-e9849270e3b9a15b6694f78c7bca33bbed603888.tar.gz nextcloud-server-e9849270e3b9a15b6694f78c7bca33bbed603888.zip | |
Revert "fixes #4574"
This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/base.php b/lib/base.php index fe160f73652..ea5adbadc9d 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; } |