Fix "headers are already sent" introduced with #6519

Backport of #7347
This commit is contained in:
Lukas Reschke
2014-02-21 10:05:05 +01:00
parent 91b4045791
commit 92b4d52079
2 changed files with 1 additions and 1 deletions
Regular → Executable
+1
View File
@@ -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);
}
Regular → Executable
-1
View File
@@ -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));