summaryrefslogtreecommitdiff
path: root/lib/plugins/authldap/auth.php
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2014-03-02 21:00:08 +0000
committerChristopher Smith <chris@jalakai.co.uk>2014-03-02 21:00:08 +0000
commitf327a5f0a9ef72e6dd79d9d200f81c330aa4903c (patch)
tree2d2a398218964e3bee0876385f9c8786a3baf8de /lib/plugins/authldap/auth.php
parent446b5b5934799f1f906ea8903b1e96c981f1c1b2 (diff)
parent709fd92548efedbd4b4e5693097165d1dff072e4 (diff)
downloadrpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.gz
rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.bz2
Merge branch 'master' into FS#2388
Diffstat (limited to 'lib/plugins/authldap/auth.php')
-rw-r--r--lib/plugins/authldap/auth.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index 94f3be8d2..6c3637e15 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -281,7 +281,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
* @param array $filter array of field/pattern pairs, null for no filter
* @return array of userinfo (refer getUserData for internal userinfo details)
*/
- function retrieveUsers($start = 0, $limit = -1, $filter = array()) {
+ function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
if(!$this->_openLDAP()) return false;
if(is_null($this->users)) {
@@ -316,7 +316,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
}
if($this->_filter($user, $info)) {
$result[$user] = $info;
- if(($limit >= 0) && (++$count >= $limit)) break;
+ if(($limit > 0) && (++$count >= $limit)) break;
}
}
return $result;