prevent errors when a user backends gives an invalid result
This commit is contained in:
parent
ca874a3ad7
commit
e039015ca1
|
@ -321,7 +321,10 @@ class OC_User {
|
||||||
$users=array();
|
$users=array();
|
||||||
foreach(self::$_usedBackends as $backend){
|
foreach(self::$_usedBackends as $backend){
|
||||||
if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
|
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;
|
return $users;
|
||||||
|
|
Loading…
Reference in New Issue