diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-31 19:28:25 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-31 19:28:25 +0100 |
| commit | 3d5c7ca2456849b7227cf24bed2bc0be4db1a555 (patch) | |
| tree | 95ca38a92c8d84d49063e3f852467feae770be96 /apps/user_ldap/user_ldap.php | |
| parent | ad044eb88861ebf2cefedc993634a85bb4697cd2 (diff) | |
| parent | 5bf7791b4212c6dba2ce7289841c71f8177cfa3f (diff) | |
| download | nextcloud-server-3d5c7ca2456849b7227cf24bed2bc0be4db1a555.tar.gz nextcloud-server-3d5c7ca2456849b7227cf24bed2bc0be4db1a555.zip | |
Merge branch 'master' into navigation
Diffstat (limited to 'apps/user_ldap/user_ldap.php')
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index b3180e11358..6aa8cd9b83c 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -116,10 +116,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { if($limit <= 0) { $limit = null; } - $search = empty($search) ? '*' : '*'.$search.'*'; $filter = $this->combineFilterWithAnd(array( $this->connection->ldapUserFilter, - $this->connection->ldapUserDisplayName.'='.$search + $this->getFilterPartForUserSearch($search) )); \OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG); |