diff options
| author | Dominik Eckelmann <eckelmann@cosmocode.de> | 2010-04-28 16:38:27 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-04-28 20:34:45 +0200 |
| commit | 9a9714ac71ab80981388c37e9b7f0e7f3505358a (patch) | |
| tree | bd16fa0cf6f802b0777edcd336366355a1940187 | |
| parent | 288007e19d34550294a9ad820b6ffa11bba0e5b3 (diff) | |
| download | rpg-9a9714ac71ab80981388c37e9b7f0e7f3505358a.tar.gz rpg-9a9714ac71ab80981388c37e9b7f0e7f3505358a.tar.bz2 | |
Avoid broken ACL check if Auth Backend fails
| -rw-r--r-- | inc/auth.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/auth.php b/inc/auth.php index ace379214..564eb0285 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -33,6 +33,9 @@ define('AUTH_ADMIN',255); function auth_setup(){ global $conf; global $auth; + global $AUTH_ACL; + global $lang; + $AUTH_ACL = array(); if(!$conf['useacl']) return false; @@ -99,7 +102,6 @@ function auth_setup(){ } //load ACL into a global array XXX - global $AUTH_ACL; if(is_readable(DOKU_CONF.'acl.auth.php')){ $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); //support user wildcard @@ -107,8 +109,6 @@ function auth_setup(){ $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(); } } |