diff options
| author | Gina Haeussge <gina@foosel.net> | 2010-06-26 13:29:02 +0200 |
|---|---|---|
| committer | Gina Haeussge <gina@foosel.net> | 2010-06-26 13:29:02 +0200 |
| commit | a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7 (patch) | |
| tree | 9f88ca6ecf0131b4f77a795951030b3bcdd9ed39 /inc/auth.php | |
| parent | 681a59b23795166231cfebc0da4d0d219d528795 (diff) | |
| parent | 345b1674b60537d4a68bce48f7cc106b771051c7 (diff) | |
| download | rpg-a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7.tar.gz rpg-a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/auth.php b/inc/auth.php index 70514316c..6a4108a7c 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -107,7 +107,6 @@ function auth_setup(){ //support user wildcard if(isset($_SERVER['REMOTE_USER'])){ $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL); - $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy } } } @@ -569,6 +568,9 @@ function auth_nameencode($name,$skip_group=false){ $cache =& $cache_authname; $name = (string) $name; + // never encode wildcard FS#1955 + if($name == '%USER%') return $name; + if (!isset($cache[$name][$skip_group])) { if($skip_group && $name{0} =='@'){ $cache[$name][$skip_group] = '@'.preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e', |