11 lines
399 B
Diff
11 lines
399 B
Diff
--- a/inc/config_cascade.php
|
|
+++ b/inc/config_cascade.php
|
|
@@ -5,7 +5,7 @@
|
|
* 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_merge(
|
|
+$config_cascade = array_merge_recursive(
|
|
array(
|
|
'main' => array(
|
|
'default' => array(DOKU_CONF . 'dokuwiki.php'),
|