diff options
| author | Martin Doucha <next_ghost@quick.cz> | 2012-07-06 14:02:10 +0200 |
|---|---|---|
| committer | Martin Doucha <next_ghost@quick.cz> | 2012-07-06 14:02:10 +0200 |
| commit | 27849ebfc6b61fbb42ec6deb9c99ff548c40b4ac (patch) | |
| tree | 5c231dfd7978a65522f56fd3be29bfe9679a64a7 /inc/parserutils.php | |
| parent | 3fb0e07d018fc6c8d173bd4a8a58c77ba00290fb (diff) | |
| parent | 4ba05e11e88dd654689b0f6333b1427e03d1b0fe (diff) | |
| download | rpg-27849ebfc6b61fbb42ec6deb9c99ff548c40b4ac.tar.gz rpg-27849ebfc6b61fbb42ec6deb9c99ff548c40b4ac.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/parserutils.php')
| -rw-r--r-- | inc/parserutils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 9384929bf..25d7cf131 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -739,7 +739,7 @@ function p_get_first_heading($id, $render=METADATA_RENDER_USING_SIMPLE_CACHE){ * @author Andreas Gohr <andi@splitbrain.org> */ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') { - global $conf, $config_cascade; + global $conf, $config_cascade, $INPUT; $language = strtolower($language); // remove any leading or trailing blank lines @@ -747,7 +747,7 @@ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') { $cache = getCacheName($language.$code,".code"); $ctime = @filemtime($cache); - if($ctime && !$_REQUEST['purge'] && + if($ctime && !$INPUT->bool('purge') && $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 |