diff options
author | Chris Smith <chris.eureka@jalakai.co.uk> | 2009-01-22 12:44:57 +0100 |
---|---|---|
committer | Chris Smith <chris.eureka@jalakai.co.uk> | 2009-01-22 12:44:57 +0100 |
commit | f8121585ae97890245b1969cb62fbef583462b7d (patch) | |
tree | 15936160cdbb9a2e22fd9ac53ecfd682c5f22e81 /lib/exe/js.php | |
parent | f0a201c5703333fa2b120cda8e145fb405283908 (diff) | |
download | rpg-f8121585ae97890245b1969cb62fbef583462b7d.tar.gz rpg-f8121585ae97890245b1969cb62fbef583462b7d.tar.bz2 |
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
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r-- | lib/exe/js.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 1caa22b8d..f3acc7491 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -220,8 +220,7 @@ function js_cacheok($cache,$files){ 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[] = DOKU_CONF.'userscript.js'; $files[] = __FILE__; |