From b303b92c45ac51a83bfe3eb519e8c7cedec64781 Mon Sep 17 00:00:00 2001
From: Chris Smith <chris.eureka@jalakai.co.uk>
Date: Mon, 19 Jan 2009 06:02:18 +0100
Subject: Update for config cascade patch, fixes a couple of issues

darcs-hash:20090119050218-f07c6-8cb3615ee51fe81ef90b1e54675c359d84a2e57c.gz
---
 inc/confutils.php | 11 +++++++----
 inc/init.php      | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'inc')

diff --git a/inc/confutils.php b/inc/confutils.php
index 77f058e0e..5b48e97dd 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -168,10 +168,13 @@ function retrieveConfig($type,$fn) {
 
   $combined = array();
   if (!is_array($config_cascade[$type])) trigger_error('Missing config cascade for "'.$type.'"',E_USER_WARNING);
-  foreach ($config_cascade[$type] as $file) {
-    if (@file_exists($file)) {
-      $config = $fn($file);
-      $combined = array_merge($combined, $config);
+  foreach (array('default','local','protected') as $config_group) {
+    if (empty($config_cascade[$type][$config_group])) continue;
+    foreach ($config_cascade[$type][$config_group] as $file) {
+      if (@file_exists($file)) {
+        $config = $fn($file);
+        $combined = array_merge($combined, $config);
+      }
     }
   }
 
diff --git a/inc/init.php b/inc/init.php
index 9ef905d52..6ed060317 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -50,32 +50,32 @@
         'protected' => array(DOKU_CONF.'local.protected.php'),
       ),
       'acronyms'  => array(
-        'default'   => array(DOKU_CONF.'acronyms.php'),
-        'local'     => array(DOKU_CONF.'acronyms.local.php'),
+        'default'   => array(DOKU_CONF.'acronyms.conf'),
+        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
       ),
       'entities'  => array(
-        'default'   => array(DOKU_CONF.'entities.php'),
-        'local'     => array(DOKU_CONF.'entities.local.php'),
+        'default'   => array(DOKU_CONF.'entities.conf'),
+        'local'     => array(DOKU_CONF.'entities.local.conf'),
       ),
       'interwiki' => array(
-        'default'   => array(DOKU_CONF.'interwiki.php'),
-        'local'     => array(DOKU_CONF.'interwiki.local.php'),
+        'default'   => array(DOKU_CONF.'interwiki.conf'),
+        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
       ),
       'mime'      => array(
-        'default'   => array(DOKU_CONF.'mime.php'),
-        'local'     => array(DOKU_CONF.'mime.local.php'),
+        'default'   => array(DOKU_CONF.'mime.conf'),
+        'local'     => array(DOKU_CONF.'mime.local.conf'),
       ),
       'scheme'    => array(
-        'default'   => array(DOKU_CONF.'scheme.php'),
-        'local'     => array(DOKU_CONF.'scheme.local.php'),
+        'default'   => array(DOKU_CONF.'scheme.conf'),
+        'local'     => array(DOKU_CONF.'scheme.local.conf'),
       ),
       'smileys'   => array(
-        'default'   => array(DOKU_CONF.'smileys.php'),
-        'local'     => array(DOKU_CONF.'smileys.local.php'),
+        'default'   => array(DOKU_CONF.'smileys.conf'),
+        'local'     => array(DOKU_CONF.'smileys.local.conf'),
       ),
       'wordblock' => array(
-        'default'   => array(DOKU_CONF.'wordblock.php'),
-        'local'     => array(DOKU_CONF.'wordblock.local.php'),
+        'default'   => array(DOKU_CONF.'wordblock.conf'),
+        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
       ),
     );
   }
@@ -85,8 +85,8 @@
   $conf = array();
 
   // load the global config file(s)
-  foreach ($config_cascade['main'] as $config_group) {
-    foreach ($config_group as $config_file) {
+  foreach (array('default','local','protected') as $config_group) {
+    foreach ($config_cascade['main'][$config_group] as $config_file) {
       @include($config_file);
     }
   }
-- 
cgit v1.2.3