diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/auth | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ad.class.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index bc4168527..e161c2939 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -70,6 +70,9 @@ class auth_ad extends auth_basic { } // Prepare SSO + if(!utf8_check($_SERVER['REMOTE_USER'])){ + $_SERVER['REMOTE_USER'] = utf8_encode($_SERVER['REMOTE_USER']); + } if($_SERVER['REMOTE_USER'] && $this->cnf['sso']){ // remove possible NTLM domain list($dom,$usr) = explode('\\',$_SERVER['REMOTE_USER'],2); |