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 /inc/parserutils.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 'inc/parserutils.php')
| -rw-r--r-- | inc/parserutils.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 7a023b159..e1f9922f0 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -631,7 +631,7 @@ function p_get_first_heading($id, $render=true){ * @author Andreas Gohr <andi@splitbrain.org> */ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') { - global $conf; + global $conf, $config_cascade; $language = strtolower($language); // remove any leading or trailing blank lines @@ -640,9 +640,9 @@ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') { $cache = getCacheName($language.$code,".code"); $ctime = @filemtime($cache); if($ctime && !$_REQUEST['purge'] && - $ctime > filemtime(DOKU_INC.'inc/geshi.php') && - $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && - $ctime > filemtime(DOKU_CONF.'dokuwiki.php')){ + $ctime > filemtime(DOKU_INC.'inc/geshi.php') && // geshi changed + $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && // language syntax definition changed + $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed $highlighted_code = io_readFile($cache, false); } else { |