diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-03-17 15:22:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 15:22:03 +0100 |
| commit | 0d46fafd41a739c74a500d6149af23deb9d70155 (patch) | |
| tree | fc14e854db1f5850d4dcdd389c4768b806c96d16 /apps/user_ldap | |
| parent | d011df6aa7a38fdfafe6bc0acddebe9e156918d8 (diff) | |
| parent | cf434d5107acc95d8a6afad15707e3e4fc33bbc9 (diff) | |
| download | nextcloud-server-0d46fafd41a739c74a500d6149af23deb9d70155.tar.gz nextcloud-server-0d46fafd41a739c74a500d6149af23deb9d70155.zip | |
Merge pull request #26161 from nextcloud/bugfix/noid/improve-matching-of-phonebook-searches
Improve search results when only phonebook-matches can we autocompleted
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/User_LDAP.php | 10 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User_Proxy.php | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index 79f230ae00b..12d93ce5c8a 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -133,7 +133,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn return false; } } - + /** * returns the username for the given LDAP DN, if available * @@ -502,8 +502,8 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * Get a list of all display names * * @param string $search - * @param string|null $limit - * @param string|null $offset + * @param int|null $limit + * @param int|null $offset * @return array an array of all displayNames (value) and the corresponding uids (key) */ public function getDisplayNames($search = '', $limit = null, $offset = null) { @@ -574,7 +574,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn public function getBackendName() { return 'LDAP'; } - + /** * Return access for LDAP interaction. * @param string $uid @@ -583,7 +583,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn public function getLDAPAccess($uid) { return $this->access; } - + /** * Return LDAP connection resource from a cloned connection. * The cloned connection needs to be closed manually. diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index e8d0a6d6948..532d8ff4cb6 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -292,8 +292,8 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, * Get a list of all display names and user ids. * * @param string $search - * @param string|null $limit - * @param string|null $offset + * @param int|null $limit + * @param int|null $offset * @return array an array of all displayNames (value) and the corresponding uids (key) */ public function getDisplayNames($search = '', $limit = null, $offset = null) { |