diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-04-26 05:51:07 -0700 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-04-26 05:51:07 -0700 |
| commit | 7e89a017bf2c41db0af13cf6070a5987c50612fa (patch) | |
| tree | 9673a95a5300a560ee67d73ee5318077ea668488 /lib | |
| parent | 67b6ee661dbccaff7369c8c1c0fb87812d1f4169 (diff) | |
| parent | 8a504592230bbe97971ddefe69377669aa276898 (diff) | |
| download | nextcloud-server-7e89a017bf2c41db0af13cf6070a5987c50612fa.tar.gz nextcloud-server-7e89a017bf2c41db0af13cf6070a5987c50612fa.zip | |
Merge pull request #2955 from owncloud/displaynames-numeric
Fix OC_User::getDisplaynames when using numeric user id's
Diffstat (limited to 'lib')
| -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); |