[Pkg-owncloud-commits] [owncloud] 116/145: Fix "headers are already sent" introduced with #6519

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 92b4d52079b6cf3f2476d17e2f411e723a73ae18
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Fri Feb 21 10:05:05 2014 +0100

    Fix "headers are already sent" introduced with #6519
    
    Backport of #7347
---
 lib/private/user.php         | 1 +
 lib/private/user/session.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/user.php b/lib/private/user.php
old mode 100644
new mode 100755
index 08aac6e..992e4a2
--- 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
old mode 100644
new mode 100755
index 71bacfe..1e29941
--- 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));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git