[Pkg-owncloud-commits] [owncloud] 11/121: Fix getting group '0' from database backend

[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 2e04c5e9565018798b438d43674fc24fc9b387d6
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Mon Aug 4 13:46:53 2014 +0200

    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(-)

diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index b7148f3..8d6ea1f 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 3613c75..2b07be4 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;

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