diff options
| author | Roland Hager <roland.hager@tu-berlin.de> | 2011-02-06 19:57:16 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2011-02-06 19:57:44 +0000 |
| commit | cca94fbcfc035dabe5597e8565671c84862268e9 (patch) | |
| tree | 0b7773784e1a87738ce953740fdf8c339953af49 /inc/init.php | |
| parent | 1a6a1c042a16fc7ed8be4d870dbf32d60c05560b (diff) | |
| download | rpg-cca94fbcfc035dabe5597e8565671c84862268e9.tar.gz rpg-cca94fbcfc035dabe5597e8565671c84862268e9.tar.bz2 | |
made config cascade more flexible
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 9 |
1 files changed, 4 insertions, 5 deletions
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; |