diff options
| author | Anika Henke <anika@selfthinker.org> | 2010-06-27 13:58:29 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2010-06-27 13:58:29 +0100 |
| commit | bf815306862aa34ee3bf304147a862efc52f9b63 (patch) | |
| tree | ac4d12b386937105d150b0c76b41f8ed1ff0837c /inc/auth.php | |
| parent | ef362bb863eb95d3968a3a1df35562914a1bbdef (diff) | |
| parent | e6a6dbfe6cfcfaf3fb0992350ea7769faa762116 (diff) | |
| download | rpg-bf815306862aa34ee3bf304147a862efc52f9b63.tar.gz rpg-bf815306862aa34ee3bf304147a862efc52f9b63.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index 6a4108a7c..49bb2d4d9 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -35,6 +35,7 @@ function auth_setup(){ global $auth; global $AUTH_ACL; global $lang; + global $config_cascade; $AUTH_ACL = array(); if(!$conf['useacl']) return false; @@ -102,8 +103,8 @@ function auth_setup(){ } //load ACL into a global array XXX - if(is_readable(DOKU_CONF.'acl.auth.php')){ - $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + if(is_readable($config_cascade['acl']['default'])){ + $AUTH_ACL = file($config_cascade['acl']['default']); //support user wildcard if(isset($_SERVER['REMOTE_USER'])){ $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL); |