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

1 files changed, 2 insertions, 3 deletions

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();