diff options
| -rw-r--r-- | inc/auth.php | 3 | ||||
| -rw-r--r-- | lib/plugins/acl/admin.php | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/inc/auth.php b/inc/auth.php index 1d325b02c..aa5439a0d 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -84,7 +84,8 @@ if(is_readable(DOKU_CONF.'acl.auth.php')){ $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); 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); + $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy } }else{ $AUTH_ACL = array(); diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 6301f1739..35b14d328 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -63,6 +63,9 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { global $AUTH_ACL; global $ID; + // fresh 1:1 copy without replacements + $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + // namespace given? if($_REQUEST['ns'] == '*'){ $this->ns = '*'; |