Merge pull request #23527 from owncloud/fix-21136

disable Paged Search when chunksize is set to 0, fixes #21136
owncloud · Apr 14, 2016 · 5911ce5 · 5911ce5
2 parents dba08f5 + c9587ce
commit 5911ce5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -85,11 +85,12 @@ public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID =
 		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() {