summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-05-08 17:54:38 +0200
committerArthur Schiwon <blizzz@owncloud.com>2013-05-08 17:54:38 +0200
commitd69579f7733c742eb0ca17e80747d1f6b06c80e9 (patch)
tree0f90fcb664e27d46c6a4afda0d8cdf9fcf034164 /apps
parent796ee8c4c0cc7b105c6fd4c0e43d40c9e898bb43 (diff)
downloadnextcloud-server-d69579f7733c742eb0ca17e80747d1f6b06c80e9.tar.gz
nextcloud-server-d69579f7733c742eb0ca17e80747d1f6b06c80e9.zip
LDAP: fix display of numerical display names
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/user_proxy.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 7e5b9045df3..73cc0963182 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -174,7 +174,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
foreach($this->backends as $backend) {
$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
if (is_array($backendUsers)) {
- $users = array_merge($users, $backendUsers);
+ $users = $users + $backendUsers;
}
}
return $users;