diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-04-17 03:08:27 +0400 |
|---|---|---|
| committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2013-06-19 01:19:53 +0400 |
| commit | 9700b84a62c3698738afb65306ba91382d630842 (patch) | |
| tree | c5e38985680cbceb50831e86b644d5f5bffeacdb /lib/user.php | |
| parent | 87f70d643e34a8a66b1c9c8aeb7e0dae16ab3cae (diff) | |
Fix OC_User::getDisplaynames when using numeric user id's
fixes #2948
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php index 1743a4af8f2..b405c36ab4d 100644 --- a/lib/user.php +++ b/lib/user.php @@ -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); |