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, 3 insertions, 2 deletions

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 90f0109ef..9fb247496 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -159,14 +159,15 @@ function css_out(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function css_cacheok($cache,$files,$tplinc){
+    global $config_cascade;
+
     if($_REQUEST['purge']) return false; //support purge request
 
     $ctime = @filemtime($cache);
     if(!$ctime) return false; //There is no cache
 
     // some additional files to check
-    $files[] = DOKU_CONF.'dokuwiki.php';
-    $files[] = DOKU_CONF.'local.php';
+    $files = array_merge($files, getConfigFiles('main'));
     $files[] = $tplinc.'style.ini';
     $files[] = __FILE__;