From 9a9714ac71ab80981388c37e9b7f0e7f3505358a Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <eckelmann@cosmocode.de>
Date: Wed, 28 Apr 2010 16:38:27 +0200
Subject: Avoid broken ACL check if Auth Backend fails

---
 inc/auth.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/auth.php')

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();
     }
 }
 
-- 
cgit v1.2.3