From cca94fbcfc035dabe5597e8565671c84862268e9 Mon Sep 17 00:00:00 2001
From: Roland Hager <roland.hager@tu-berlin.de>
Date: Sun, 6 Feb 2011 19:57:16 +0000
Subject: made config cascade more flexible

---
 inc/init.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index 6f4ba1ca9..d632bd8f8 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -11,7 +11,7 @@ function delta_time($start=0) {
 define('DOKU_START_TIME', delta_time());
 
 global $config_cascade;
-$config_cascade = '';
+$config_cascade = array();
 
 // if available load a preload config file
 $preload = fullpath(dirname(__FILE__)).'/preload.php';
@@ -52,10 +52,9 @@ global $cache_authname;
 global $cache_metadata;
        $cache_metadata = array();
 
-//set the configuration cascade - but only if its not already been set in preload.php
-if (empty($config_cascade)) {
-    include(DOKU_INC.'inc/config_cascade.php');
-}
+// always include 'inc/config_cascade.php'
+// previously in preload.php set fields of $config_cascade will be merged with the defaults
+include(DOKU_INC.'inc/config_cascade.php');
 
 //prepare config array()
 global $conf;
-- 
cgit v1.2.3