Fix getting group '0' from database backend

Fix #9972

diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index d855ad4b34922c9344543860ed06085db148dc83..66c2577dcdcac7acf10627ba4bf04e58d57d0974 100644 (file)
--- 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 3e51b71bcf5d1a9d6f4ffb1dfe43cd90738c64a1..2a2fa5a67f70835de5927cb08b1d7620520bbdef 100644 (file)
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -106,7 +106,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;