summaryrefslogtreecommitdiff
path: root/inc/config_cascade.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/config_cascade.php')
-rw-r--r--inc/config_cascade.php5
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
);