Revert "fixes #4574"

This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.

diff --git a/lib/base.php b/lib/base.php
index fe160f73652492f24cca5149866a72f8ec0856df..ea5adbadc9d9f7b04e1d7575d0f6d0b8a0ab3a3e 100644 (file)
--- 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;
        }