[Pkg-owncloud-commits] [owncloud] 12/121: Fix isLoggedIn() check for user '0'

[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 cc531fc9053711cae41bf655bc6264daba239c3c
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Mon Aug 4 14:47:14 2014 +0200

    Fix isLoggedIn() check for user '0'
    
    Fix #9972
    
    Conflicts:
    	lib/private/user/session.php
---
 lib/private/user.php         | 2 +-
 lib/private/user/session.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/user.php b/lib/private/user.php
index a8431af..5efe205 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -337,7 +337,7 @@ class OC_User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn() {
-		if (\OC::$session->get('user_id') && self::$incognitoMode === false) {
+		if (\OC::$session->get('user_id') !== null && self::$incognitoMode === false) {
 			return self::userExists(\OC::$session->get('user_id'));
 		}
 		return false;
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 3e0d7ab..92f2c8e 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -106,7 +106,7 @@ class Session implements IUserSession, Emitter {
 			return $this->activeUser;
 		} else {
 			$uid = $this->getSession()->get('user_id');
-			if ($uid) {
+			if ($uid !== null) {
 				$this->activeUser = $this->manager->get($uid);
 				return $this->activeUser;
 			} else {

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