From c8f80b4e70ee1b73ecc08cac583d021979af9359 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 27 Jun 2010 14:43:56 +0200
Subject: Use config_cascade for ACLs and plain auth users FS#1677

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

(limited to 'inc/auth.php')

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