diff options
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/inc/init.php b/inc/init.php index 6f4ba1ca9..819d92bdc 100644 --- a/inc/init.php +++ b/inc/init.php @@ -5,13 +5,12 @@ // start timing Dokuwiki execution function delta_time($start=0) { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec+(float)$sec)-((float)$start); + return microtime(true)-((float)$start); } define('DOKU_START_TIME', delta_time()); global $config_cascade; -$config_cascade = ''; +$config_cascade = array(); // if available load a preload config file $preload = fullpath(dirname(__FILE__)).'/preload.php'; @@ -52,10 +51,9 @@ global $cache_authname; global $cache_metadata; $cache_metadata = array(); -//set the configuration cascade - but only if its not already been set in preload.php -if (empty($config_cascade)) { - include(DOKU_INC.'inc/config_cascade.php'); -} +// always include 'inc/config_cascade.php' +// previously in preload.php set fields of $config_cascade will be merged with the defaults +include(DOKU_INC.'inc/config_cascade.php'); //prepare config array() global $conf; @@ -276,6 +274,7 @@ function init_files(){ } # create title index (needs to have same length as page.idx) + /* $file = $conf['indexdir'].'/title.idx'; if(!@file_exists($file)){ $pages = file($conf['indexdir'].'/page.idx'); @@ -290,6 +289,7 @@ function init_files(){ nice_die("$file is not writable. Check your permissions settings!"); } } + */ } /** |