Merge pull request #2955 from owncloud/displaynames-numeric

Fix OC_User::getDisplaynames when using numeric user id's
This commit is contained in:
Bart Visscher 2013-04-26 05:51:07 -07:00
commit 7e89a017bf

View file

@ -527,7 +527,7 @@ class OC_User {
foreach (self::$_usedBackends as $backend) {
$backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
if (is_array($backendDisplayNames)) {
$displayNames = array_merge($displayNames, $backendDisplayNames);
$displayNames = $displayNames + $backendDisplayNames;
}
}
asort($displayNames);