[Pkg-owncloud-commits] [owncloud] 34/78: don't return null for not existing group id's

[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 1ae73f0e996ba571e0523030db348e40ebc1e104
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Tue Apr 7 13:47:10 2015 +0200

    don't return null for not existing group id's
---
 lib/private/group/manager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 417be79..a7e83f9 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);

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