diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2014-02-21 13:05:05 +0400 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2014-02-21 13:05:05 +0400 |
commit | 92b4d52079b6cf3f2476d17e2f411e723a73ae18 (patch) | |
tree | a9ae97a5d869d111cb0147e119c4045e03f9a56c | |
parent | 91b40457917d74a95e08ac75d98e652350f750ae (diff) |
Fix "headers are already sent" introduced with #6519
Backport of #7347
-rwxr-xr-x[-rw-r--r--] | lib/private/user.php | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/private/user/session.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 08aac6e327e..992e4a2d751 100644..100755 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -227,6 +227,7 @@ class OC_User { * Log in a user and regenerate a new session - if the password is ok */ public static function login($uid, $password) { + session_regenerate_id(true); return self::getUserSession()->login($uid, $password); } diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 71bacfeb5b9..1e299416fb3 100644..100755 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -157,7 +157,6 @@ class Session implements Emitter, \OCP\IUserSession { if($user !== false) { if (!is_null($user)) { if ($user->isEnabled()) { - session_regenerate_id(true); $this->setUser($user); $this->setLoginName($uid); $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); |