diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-15 01:32:45 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-15 01:32:45 -0700 |
| commit | bc1ca93eaed5d2f593673cc7eee7b5d44bcdcd22 (patch) | |
| tree | ab3f5b8661667c4b2cf6ad1be5efc6ca43e66388 /lib/plugins | |
| parent | bb6d8edde84fe91fffa1e5850ea7c855e15a5c72 (diff) | |
| parent | 4f11d93def5599386f32a03401a73e7175679f22 (diff) | |
| download | rpg-bc1ca93eaed5d2f593673cc7eee7b5d44bcdcd22.tar.gz rpg-bc1ca93eaed5d2f593673cc7eee7b5d44bcdcd22.tar.bz2 | |
Merge pull request #345 from splitbrain/ldapgroupmapping
skips 'count' entries in ldap results. Fixes FS#2370
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/authldap/auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index 6a967a6d4..de1332282 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -208,8 +208,8 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { if(is_array($key)) { // use regexp to clean up user_result list($key, $regexp) = each($key); - if($user_result[$key]) foreach($user_result[$key] as $grp) { - if(preg_match($regexp, $grp, $match)) { + if($user_result[$key]) foreach($user_result[$key] as $grpkey => $grp) { + if($grpkey !== 'count' && preg_match($regexp, $grp, $match)) { if($localkey == 'grps') { $info[$localkey][] = $match[1]; } else { |