]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix OC_User::getDisplaynames when using numeric user id's
authorRobin Appelman <icewind@owncloud.com>
Tue, 16 Apr 2013 23:08:27 +0000 (01:08 +0200)
committerVictor Dubiniuk <victor.dubiniuk@gmail.com>
Tue, 18 Jun 2013 21:19:53 +0000 (00:19 +0300)
fixes #2948

lib/user.php

index 1743a4af8f217285c758a92ed6ef7f2f889ea79c..b405c36ab4d3777fb4ca496d369695af0fc18c2e 100644 (file)
@@ -528,7 +528,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);