diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-12 07:41:44 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-12 07:41:44 +0200 |
| commit | c9c5e1b97f2c5951dffc8104e22a315654780118 (patch) | |
| tree | 6b4a67fe094bea99facab6883c774c611b8f7b80 /lib/base.php | |
| parent | 037cf22c518b6f3e6a462577c49159a1fae2442d (diff) | |
| parent | b7205d97d7797daf057d47a5a07d2bad3b0db4da (diff) | |
| download | nextcloud-server-c9c5e1b97f2c5951dffc8104e22a315654780118.tar.gz nextcloud-server-c9c5e1b97f2c5951dffc8104e22a315654780118.zip | |
Merge branch 'master' into oc_avatars
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 50a9b49fb35..d3d570e3f37 100644 --- a/lib/base.php +++ b/lib/base.php @@ -834,16 +834,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; } |