summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-25 14:35:06 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-25 14:35:06 +0100
commitdfaebc36d2f2b458c8d4b744fc282ca9f14c240b (patch)
treeec1140d7b999e47468c894d11c567afd44871762
parentefc966698f04f5b08c9e8ed262f2c673babd4406 (diff)
parentb9b85e32becfbd9ee5be40e673a153334422a31e (diff)
downloadnextcloud-server-dfaebc36d2f2b458c8d4b744fc282ca9f14c240b.tar.gz
nextcloud-server-dfaebc36d2f2b458c8d4b744fc282ca9f14c240b.zip
Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
-rw-r--r--apps/user_ldap/lib/access.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 16b942084c4..8b83b7d917f 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -546,8 +546,8 @@ class Access extends LDAPUtility implements user\IUserTools {
if(is_null($nameByLDAP)) {
continue;
}
- $sndName = isset($ldapObject[$sndAttribute])
- ? $ldapObject[$sndAttribute] : '';
+ $sndName = isset($ldapObject[$sndAttribute][0])
+ ? $ldapObject[$sndAttribute][0] : '';
$this->cacheUserDisplayName($ocName, $nameByLDAP, $sndName);
}
}