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, 8 insertions, 4 deletions

diff --git a/inc/media.php b/inc/media.php
index 2d3ca3556..515fa0826 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -80,15 +80,19 @@ function media_metasave($id,$auth,$data){
  */
 function media_metaform($id,$auth){
     if($auth < AUTH_UPLOAD) return false;
-    global $lang;
+    global $lang, $config_cascade;
 
     // load the field descriptions
     static $fields = null;
     if(is_null($fields)){
-        include(DOKU_CONF.'mediameta.php');
-        if(@file_exists(DOKU_CONF.'mediameta.local.php')){
-            include(DOKU_CONF.'mediameta.local.php');
+
+      foreach (array('default','local') as $config_group) {
+        if (empty($config_cascade['mediameta'][$config_group])) continue;
+        foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
+        if(@file_exists($config_file)){
+          include($config_file);
         }
+      }
     }
 
     $src = mediaFN($id);