diff options
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php index 34f44f572e0..0746fcc6eb4 100644 --- a/lib/user.php +++ b/lib/user.php @@ -321,7 +321,10 @@ class OC_User { $users=array(); foreach(self::$_usedBackends as $backend){ if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){ - $users=array_merge($users,$backend->getUsers()); + $backendUsers=$backend->getUsers(); + if(is_array($backendUsers)){ + $users=array_merge($users,$backendUsers); + } } } return $users; |