diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-06 09:53:13 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-06 09:53:13 +0200 |
| commit | a72dae6842d6b550ccc8e8eb9a03f6911ae46d18 (patch) | |
| tree | cb6dc9d44392498fde33db574e4835d8ad35a7d7 /lib/private/group | |
| parent | 6599dc1b5ca57a8460f9e26893e3254a554e03a9 (diff) | |
| parent | 4865c52aa6018c377597e2ce466cc5e60121fe61 (diff) | |
| download | nextcloud-server-a72dae6842d6b550ccc8e8eb9a03f6911ae46d18.tar.gz nextcloud-server-a72dae6842d6b550ccc8e8eb9a03f6911ae46d18.zip | |
Merge pull request #10144 from owncloud/issue/9972
Issue/9972 Fix issues with group and username `0`
Diffstat (limited to 'lib/private/group')
| -rw-r--r-- | lib/private/group/database.php | 2 | ||||
| -rw-r--r-- | 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 b7148f38fe3..8d6ea1f50a5 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 368fa3851d7..bea7ad193bf 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; |