diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-02-14 09:27:10 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-02-14 09:27:10 +0100 |
| commit | fcceebc15bef73a680d6051ddfd097fd8ee9737e (patch) | |
| tree | 48a6f2b7b3130cfef229fa231c8fcde46906be52 /lib | |
| parent | 0931b30cccfd534a64df4da966e67e0175948849 (diff) | |
| parent | 38e97ed02731b8126aff3d921ad82e72212129a2 (diff) | |
| download | rpg-fcceebc15bef73a680d6051ddfd097fd8ee9737e.tar.gz rpg-fcceebc15bef73a680d6051ddfd097fd8ee9737e.tar.bz2 | |
Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524
* 'master' of git://github.com/SteScho/dokuwiki:
Update auth.php
Update auth.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/authldap/auth.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index 31e2c5135..98858cb40 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -143,6 +143,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { * @author Dan Allen <dan.j.allen@gmail.com> * @author <evaldas.auryla@pheur.org> * @author Stephane Chazelas <stephane.chazelas@emerson.com> + * @author Steffen Schoch <schoch@dsb.net> * * @param string $user * @param bool $inbind authldap specific, true if in bind phase @@ -241,8 +242,9 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { if(is_array($result)) foreach($result as $grp) { if(!empty($grp[$this->getConf('groupkey')][0])) { - $this->_debug('LDAP usergroup: '.htmlspecialchars($grp[$this->getConf('groupkey')][0]), 0, __LINE__, __FILE__); - $info['grps'][] = $grp[$this->getConf('groupkey')][0]; + $groupkey = (is_array($grp[$this->getConf('groupkey')][0])) ? $grp[$this->getConf('groupkey')][0] : $grp[$this->getConf('groupkey')]; + $this->_debug('LDAP usergroup: '.htmlspecialchars($groupkey), 0, __LINE__, __FILE__); + $info['grps'][] = $groupkey; } } } |