diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
| commit | 7b950f2d59050052c1d9251b0bd9bd40c7441040 (patch) | |
| tree | 98a14f7a197ed87059aab12b3c2a424000962a43 /lib/plugins/authad | |
| parent | 9d209ab87700c872fa85dcbee8623ad386190847 (diff) | |
| parent | 2dc9e90007f12ac996b0e74479137a9dc6243c3c (diff) | |
| download | rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.gz rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.bz2 | |
Merge remote-tracking branch 'origin/auth_getUserData_improvements'
* origin/auth_getUserData_improvements:
KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace with boolean values
use $requireGroups constants in auth classes; comments; code improvements
fix comment errors, sp. & grammar
code styling - add missing braces
Allow user info to be retrieved without groups
Restore correct public interface of getUserData() for authldap plugin
Conflicts:
inc/common.php
Diffstat (limited to 'lib/plugins/authad')
| -rw-r--r-- | lib/plugins/authad/auth.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 0860e5756..a3119dda6 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -177,9 +177,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { * * @author James Van Lommel <james@nosq.com> * @param string $user + * @param bool $requireGroups (optional) - ignored, groups are always supplied by this plugin * @return array */ - public function getUserData($user) { + public function getUserData($user, $requireGroups=true) { global $conf; global $lang; global $ID; |