summaryrefslogtreecommitdiff
path: root/inc/auth.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/auth.php')
-rw-r--r--inc/auth.php6
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();
}
}