diff options
| author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-04-14 11:14:19 -0400 |
|---|---|---|
| committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-04-14 11:14:19 -0400 |
| commit | 5911ce530b003d46348f59e9280b610f684de85a (patch) | |
| tree | fafa2185a97f8c939c2e16f09afd7200e34cce65 /apps/user_ldap | |
| parent | dba08f5fca3ae01dbfe83dc7bc8c0dec68505450 (diff) | |
| parent | c9587cea76fb1b5e3d8f9edbb60934994860cd51 (diff) | |
| download | nextcloud-server-5911ce530b003d46348f59e9280b610f684de85a.tar.gz nextcloud-server-5911ce530b003d46348f59e9280b610f684de85a.zip | |
Merge pull request #23527 from owncloud/fix-21136
disable Paged Search when chunksize is set to 0, fixes #21136
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/configuration.php | 3 | ||||
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index daec2bed13a..418a2bfc015 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -28,6 +28,9 @@ namespace OCA\user_ldap\lib; +/** + * @property int ldapPagingSize holds an integer + */ class Configuration { protected $configPrefix = null; diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index c485ac74395..53c9b3790a7 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -85,11 +85,12 @@ class Connection extends LDAPUtility { if($memcache->isAvailable()) { $this->cache = $memcache->create(); } - $this->hasPagedResultSupport = - $this->ldap->hasPagedResultSupport(); $helper = new Helper(); $this->doNotValidate = !in_array($this->configPrefix, $helper->getServerConfigurationPrefixes()); + $this->hasPagedResultSupport = + intval($this->configuration->ldapPagingSize) !== 0 + || $this->ldap->hasPagedResultSupport(); } public function __destruct() { |