diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-04-17 01:08:27 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-04-17 01:08:27 +0200 |
| commit | 8a504592230bbe97971ddefe69377669aa276898 (patch) | |
| tree | 8ace704b46003068157aebdb80bce7e6faf0e29b /lib/user.php | |
| parent | c50dfd725142abdbad93dbcf01fe13193445386a (diff) | |
| download | nextcloud-server-8a504592230bbe97971ddefe69377669aa276898.tar.gz nextcloud-server-8a504592230bbe97971ddefe69377669aa276898.zip | |
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 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); |