From f80baf03d4003d6ac2857999ed08f82bb19071be Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Aug 2014 13:46:53 +0200
Subject: Fix getting group '0' from database backend

Fix #9972
---
 lib/private/group/database.php | 2 +-
 lib/private/group/manager.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/private')

diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index baaf2cf2739..8a6cb68753c 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -185,7 +185,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	public function groupExists($gid) {
 		$query = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` = ?');
 		$result = $query->execute(array($gid))->fetchOne();
-		if ($result) {
+		if ($result !== false) {
 			return true;
 		}
 		return false;
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index dae6443e9d4..bf0910463dc 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -125,7 +125,7 @@ class Manager extends PublicEmitter {
 	 * @return \OC\Group\Group
 	 */
 	public function createGroup($gid) {
-		if (!$gid) {
+		if ($gid === '' || is_null($gid)) {
 			return false;
 		} else if ($group = $this->get($gid)) {
 			return $group;
-- 
cgit v1.2.3


From 4865c52aa6018c377597e2ce466cc5e60121fe61 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Aug 2014 14:47:14 +0200
Subject: Fix isLoggedIn() check for user '0'

Fix #9972
---
 lib/private/user.php         | 2 +-
 lib/private/user/session.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/private')

diff --git a/lib/private/user.php b/lib/private/user.php
index 5d3ebb57c8c..76f3497da0b 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 5f0dee607ae..226f948efef 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -105,7 +105,7 @@ class Session implements Emitter, \OCP\IUserSession {
 			return $this->activeUser;
 		} else {
 			$uid = $this->session->get('user_id');
-			if ($uid) {
+			if ($uid !== null) {
 				$this->activeUser = $this->manager->get($uid);
 				return $this->activeUser;
 			} else {
-- 
cgit v1.2.3