diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-24 13:02:19 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-24 23:54:38 +0100 |
| commit | e039015ca1d600a227b4cd0665192f3e22f3d1f2 (patch) | |
| tree | e55343f989d8f2bca56b449596087f42f05b9af0 /lib/user.php | |
| parent | ca874a3ad776c9fd22c7bcbad81f493cfc551661 (diff) | |
| download | nextcloud-server-e039015ca1d600a227b4cd0665192f3e22f3d1f2.tar.gz nextcloud-server-e039015ca1d600a227b4cd0665192f3e22f3d1f2.zip | |
prevent errors when a user backends gives an invalid result
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; |