diff options
| author | Anika Henke <anika@selfthinker.org> | 2010-06-27 13:58:29 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2010-06-27 13:58:29 +0100 |
| commit | bf815306862aa34ee3bf304147a862efc52f9b63 (patch) | |
| tree | ac4d12b386937105d150b0c76b41f8ed1ff0837c /inc/init.php | |
| parent | ef362bb863eb95d3968a3a1df35562914a1bbdef (diff) | |
| parent | e6a6dbfe6cfcfaf3fb0992350ea7769faa762116 (diff) | |
| download | rpg-bf815306862aa34ee3bf304147a862efc52f9b63.tar.gz rpg-bf815306862aa34ee3bf304147a862efc52f9b63.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/inc/init.php b/inc/init.php index 9a3eaf9c9..b53167e3c 100644 --- a/inc/init.php +++ b/inc/init.php @@ -54,49 +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'), - ), - ); + include(DOKU_INC.'inc/config_cascade.php'); } //prepare config array() |