diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-16 05:48:18 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-16 05:48:18 -0800 |
| commit | 17d21a84b625cdb216faa4ad24280644bbc6b51f (patch) | |
| tree | bb20de03cd9a72cb1c2a902e4f2e384be94b6573 /apps | |
| parent | 4708d4549d5574e39dfd18c722941b5512cabc89 (diff) | |
| parent | bef48bad8b83b2826d6eb3397e3f22e8d20ba5f3 (diff) | |
| download | nextcloud-server-17d21a84b625cdb216faa4ad24280644bbc6b51f.tar.gz nextcloud-server-17d21a84b625cdb216faa4ad24280644bbc6b51f.zip | |
Merge pull request #1729 from owncloud/fix_1727
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 7778c37c794..50effd79c1f 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -221,7 +221,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { $this->connection->ldapUserDisplayName); if($displayName && (count($displayName) > 0)) { - $this->connection->writeToCache($cacheKey, $displayName); + $this->connection->writeToCache($cacheKey, $displayName[0]); return $displayName[0]; } @@ -258,7 +258,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions); + return (bool)((OC_USER_BACKEND_CHECK_PASSWORD + | OC_USER_BACKEND_GET_HOME + | OC_USER_BACKEND_GET_DISPLAYNAME) + & $actions); } /** |