diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-05-16 11:47:11 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-05-16 11:47:11 +0200 |
| commit | 89167b55d9da5a67be5678038be7a474e5956dbd (patch) | |
| tree | d41dcbca53dba23d71b300782805c5f5314e5cfa /inc/parserutils.php | |
| parent | 38175ed45a1a1684e8da55d0f5cd825ee4804c3d (diff) | |
| parent | 313d3e75d6e76a2d4336143256b8d0b8777e2849 (diff) | |
| download | rpg-89167b55d9da5a67be5678038be7a474e5956dbd.tar.gz rpg-89167b55d9da5a67be5678038be7a474e5956dbd.tar.bz2 | |
Merge pull request #1152 from splitbrain/composer
Use composer to add 3rd party libs
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); |