wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1729 from owncloud/fix_1727

Browse source 
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
This commit is contained in:
Frank Karlitschek 2013-02-16 05:48:18 -08:00
commit 17d21a84b6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/user_ldap/user_ldap.php
View file

@ -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);
}
/**