From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 16 Apr 2013 23:08:27 +0000 (+0200)
Subject: Fix OC_User::getDisplaynames when using numeric user id's
X-Git-Tag: v6.0.0alpha2~843^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a504592230bbe97971ddefe69377669aa276898;p=nextcloud-server.git

Fix OC_User::getDisplaynames when using numeric user id's

fixes #2948
---

diff --git a/lib/user.php b/lib/user.php
index b19af940795..226b716188d 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -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);