diff options
| author | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
|---|---|---|
| committer | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
| commit | e3626db54846ba20cefbc1a9e2d8e29c40137067 (patch) | |
| tree | be549543a7c36718ffb06a6293fe80ee0675ec92 /inc/auth | |
| parent | 7cceaa7443c80b526a6bbad32b6cbdf5d759fd39 (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.gz rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ad.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 9ae6dbbd1..90fe0266b 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -26,7 +26,7 @@ * $conf['auth']['ad']['use_ssl'] = 1; * $conf['auth']['ad']['debug'] = 1; * - * // get additional informations to the userinfo array + * // get additional information to the userinfo array * // add a list of comma separated ldap contact fields. * $conf['auth']['ad']['additional'] = 'field1,field2'; * @@ -155,7 +155,7 @@ class auth_ad extends auth_basic { $info['uid'] = $result[0]['samaccountname'][0]; $info['dn'] = $result[0]['dn']; - // additional informations + // additional information foreach ($this->cnf['additional'] as $field) { if (isset($result[0][strtolower($field)])) { $info[$field] = $result[0][strtolower($field)][0]; |