From f8121585ae97890245b1969cb62fbef583462b7d Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 22 Jan 2009 12:44:57 +0100 Subject: further updates to config_cascade patch - add mediameta and license config files into the cascade - update the cache validity code in cache.php, css.php & js.php to use config_cascade - redo inclusion of main config files to avoid suppression of errors in config files - add getConfigFiles($type) function - minor updates elsewhere to use config_cascade rather than hardcoded config file names darcs-hash:20090122114457-f07c6-98ad5627fd5df93edf8dd03289b9cf6d81962afe.gz --- inc/cache.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'inc/cache.php') diff --git a/inc/cache.php b/inc/cache.php index 3eecd8a75..a6979d1c2 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -181,18 +181,17 @@ class cache_parser extends cache { } function _addDependencies() { - global $conf; + global $conf, $config_cascade; $this->depends['age'] = isset($this->depends['age']) ? min($this->depends['age'],$conf['cachetime']) : $conf['cachetime']; // parser cache file dependencies ... $files = array($this->file, // ... source - DOKU_CONF.'dokuwiki.php', // ... config - DOKU_CONF.'local.php', // ... local config DOKU_INC.'inc/parser/parser.php', // ... parser DOKU_INC.'inc/parser/handler.php', // ... handler ); + $files = array_merge($files, getConfigFiles('main')); // ... wiki settings $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files; parent::_addDependencies(); -- cgit v1.2.3