diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
| commit | f97db66038968542deefbf9817a3dd49b67b1904 (patch) | |
| tree | 6995f5bfd7017999a743c327474afc7b9514d94f /lib/plugins/auth.php | |
| parent | 6384941886832589f7bb3c13bc18115499cf9369 (diff) | |
| parent | 9f12fc1cc9e916c3172a0cf8953ed70fd18f2ec1 (diff) | |
| download | rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.gz rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into userlink
Conflicts:
inc/parser/renderer.php
inc/template.php
Diffstat (limited to 'lib/plugins/auth.php')
| -rw-r--r-- | lib/plugins/auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php index dc66d6380..b04735639 100644 --- a/lib/plugins/auth.php +++ b/lib/plugins/auth.php @@ -316,11 +316,11 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin { * * @author Chris Smith <chris@jalakai.co.uk> * @param int $start index of first user to be returned - * @param int $limit max number of users to be returned + * @param int $limit max number of users to be returned, 0 for unlimited * @param array $filter array of field/pattern pairs, null for no filter * @return array list of userinfo (refer getUserData for internal userinfo details) */ - public function retrieveUsers($start = 0, $limit = -1, $filter = null) { + public function retrieveUsers($start = 0, $limit = 0, $filter = null) { msg("authorisation method does not support mass retrieval of user data", -1); return array(); } |