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/config_cascade.php | |
| parent | 1a6a1c042a16fc7ed8be4d870dbf32d60c05560b (diff) | |
| download | rpg-cca94fbcfc035dabe5597e8565671c84862268e9.tar.gz rpg-cca94fbcfc035dabe5597e8565671c84862268e9.tar.bz2 | |
made config cascade more flexible
Diffstat (limited to 'inc/config_cascade.php')
| -rw-r--r-- | inc/config_cascade.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 3ae68a000..32001be81 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -5,7 +5,8 @@ * This array configures the default locations of various files in the * DokuWiki directory hierarchy. It can be overriden in inc/preload.php */ -$config_cascade = array( +$config_cascade = array_merge( + array( 'main' => array( 'default' => array(DOKU_CONF.'dokuwiki.php'), 'local' => array(DOKU_CONF.'local.php'), @@ -62,5 +63,7 @@ $config_cascade = array( 'plainauth.users' => array( 'default' => DOKU_CONF.'users.auth.php', ), + ), + $config_cascade ); |