prevent errors when a user backends gives an invalid result

14 years ago · e039015ca1
parent ca874a3ad7
commit e039015ca1
1 changed files with 4 additions and 1 deletions
--- 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;