diff --git a/lib/private/group/database.php b/lib/private/group/database.php index b7148f38fe34eb0d478cd0fd591bc6cd5e76eda0..8d6ea1f50a58668d76707dcb0740f81cd7689f64 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 368fa3851d7ade9a8822b2c934ae796fba075a8b..bea7ad193bf0d3025285837d280c638a18924ea7 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -126,7 +126,7 @@ class Manager extends PublicEmitter implements IGroupManager { * @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; diff --git a/lib/private/user.php b/lib/private/user.php index a8431af97fdac628dc81946efd7cfd3a9c7af46a..5efe205ced9d66e8c0a3592f1d072bbb47da4b69 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 8c9b3e264e3371f249393c70bc432972f16dfd82..6abf8fb80d2ad4eaecc39dc454c0a01101e713ef 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->session->get('user_id'); - if ($uid) { + if ($uid !== null) { $this->activeUser = $this->manager->get($uid); return $this->activeUser; } else {