diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
| commit | 4b8290f563ad5ac84dd92fb8ca97ba5970c472b3 (patch) | |
| tree | 7dca7c98013775628c2b4d1596e0be41d8d4bda2 /inc/parserutils.php | |
| parent | 9a734b7aaba1445e06c1ccb95e59f54e01688d45 (diff) | |
| parent | 4286c64e98499b93056c09498c10709f8909befd (diff) | |
| download | rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.gz rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.bz2 | |
Merge branch 'master' into ioreplaceinfile
Diffstat (limited to 'inc/parserutils.php')
| -rw-r--r-- | inc/parserutils.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 17c331ef5..8650f974f 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -746,14 +746,13 @@ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') { $cache = getCacheName($language.$code,".code"); $ctime = @filemtime($cache); 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(DOKU_INC.'vendor/composer/installed.json') && // libraries changed $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed $highlighted_code = io_readFile($cache, false); } else { - $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi'); + $geshi = new GeSHi($code, $language); $geshi->set_encoding('utf-8'); $geshi->enable_classes(); $geshi->set_header_type(GESHI_HEADER_PRE); |