Merge pull request #2955 from owncloud/displaynames-numeric

Fix OC_User::getDisplaynames when using numeric user id's
2013-04-26 05:51:07 +07:00 · 2013-04-26 05:51:07 +07:00 · 7e89a017bf
parent 67b6ee661d 8a50459223
commit 7e89a017bf
1 changed files with 1 additions and 1 deletions
--- 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);