diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-04-10 14:23:38 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-10 14:23:38 +0200 |
commit | 43b2f3c2dc76caadb1a32d6341fa24a39083d8fb (patch) | |
tree | 115984614c2dd970f207aebbcc10ed75aaf0868d /lib | |
parent | a4c0f259a5704794d6d2f65558def4b3410d1395 (diff) | |
parent | 1ae73f0e996ba571e0523030db348e40ebc1e104 (diff) | |
download | nextcloud-server-43b2f3c2dc76caadb1a32d6341fa24a39083d8fb.tar.gz nextcloud-server-43b2f3c2dc76caadb1a32d6341fa24a39083d8fb.zip |
Merge pull request #15435 from owncloud/dont_return_empty_groups
don't return null for not existing group id's
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/group/manager.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 417be79ab30..a7e83f932d1 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -156,7 +156,10 @@ class Manager extends PublicEmitter implements IGroupManager { foreach ($this->backends as $backend) { $groupIds = $backend->getGroups($search, $limit, $offset); foreach ($groupIds as $groupId) { - $groups[$groupId] = $this->get($groupId); + $group = $this->get($groupId); + if (!is_null($group)) { + $groups[$groupId] = $group; + } } if (!is_null($limit) and $limit <= 0) { return array_values($groups); |