summaryrefslogtreecommitdiff
path: root/inc/init.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-06-27 14:52:47 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-06-27 14:53:42 +0200
commite6a6dbfe6cfcfaf3fb0992350ea7769faa762116 (patch)
treecd281c070670f11774b0d05685be764eed29ddf3 /inc/init.php
parent0b34c70fcb312d38e6110e2ca1432779ffb73a8a (diff)
downloadrpg-e6a6dbfe6cfcfaf3fb0992350ea7769faa762116.tar.gz
rpg-e6a6dbfe6cfcfaf3fb0992350ea7769faa762116.tar.bz2
moved default config cascade to its own file
Diffstat (limited to 'inc/init.php')
-rw-r--r--inc/init.php50
1 files changed, 1 insertions, 49 deletions
diff --git a/inc/init.php b/inc/init.php
index 21382cdb0..b53167e3c 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -54,55 +54,7 @@ global $cache_metadata;
//set the configuration cascade - but only if its not already been set in preload.php
if (empty($config_cascade)) {
- $config_cascade = array(
- 'main' => array(
- 'default' => array(DOKU_CONF.'dokuwiki.php'),
- 'local' => array(DOKU_CONF.'local.php'),
- 'protected' => array(DOKU_CONF.'local.protected.php'),
- ),
- 'acronyms' => array(
- 'default' => array(DOKU_CONF.'acronyms.conf'),
- 'local' => array(DOKU_CONF.'acronyms.local.conf'),
- ),
- 'entities' => array(
- 'default' => array(DOKU_CONF.'entities.conf'),
- 'local' => array(DOKU_CONF.'entities.local.conf'),
- ),
- 'interwiki' => array(
- 'default' => array(DOKU_CONF.'interwiki.conf'),
- 'local' => array(DOKU_CONF.'interwiki.local.conf'),
- ),
- 'license' => array(
- 'default' => array(DOKU_CONF.'license.php'),
- 'local' => array(DOKU_CONF.'license.local.php'),
- ),
- 'mediameta' => array(
- 'default' => array(DOKU_CONF.'mediameta.php'),
- 'local' => array(DOKU_CONF.'mediameta.local.php'),
- ),
- 'mime' => array(
- 'default' => array(DOKU_CONF.'mime.conf'),
- 'local' => array(DOKU_CONF.'mime.local.conf'),
- ),
- 'scheme' => array(
- 'default' => array(DOKU_CONF.'scheme.conf'),
- 'local' => array(DOKU_CONF.'scheme.local.conf'),
- ),
- 'smileys' => array(
- 'default' => array(DOKU_CONF.'smileys.conf'),
- 'local' => array(DOKU_CONF.'smileys.local.conf'),
- ),
- 'wordblock' => array(
- 'default' => array(DOKU_CONF.'wordblock.conf'),
- 'local' => array(DOKU_CONF.'wordblock.local.conf'),
- ),
- 'acl' => array(
- 'default' => DOKU_CONF.'acl.auth.php',
- ),
- 'plainauth.users' => array(
- 'default' => DOKU_CONF.'users.auth.php',
- ),
- );
+ include(DOKU_INC.'inc/config_cascade.php');
}
//prepare config array()