]> git.pld-linux.org Git - packages/dokuwiki.git/blob - dokuwiki-geshi.patch
still old deprecated wrappers, some plugins still have addInitEvent() calls
[packages/dokuwiki.git] / dokuwiki-geshi.patch
1 --- dokuwiki-2012-07-08/./inc/parserutils.php~  2012-07-07 13:06:48.000000000 +0300
2 +++ dokuwiki-2012-07-08/./inc/parserutils.php   2012-07-08 11:20:06.395684716 +0300
3 @@ -748,14 +748,14 @@
4      $cache = getCacheName($language.$code,".code");
5      $ctime = @filemtime($cache);
6      if($ctime && !$INPUT->bool('purge') &&
7 -            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
8 -            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
9 +            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
10 +            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
11              $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
12          $highlighted_code = io_readFile($cache, false);
13  
14      } else {
15  
16 -        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
17 +        $geshi = new GeSHi($code, $language);
18          $geshi->set_encoding('utf-8');
19          $geshi->enable_classes();
20          $geshi->set_header_type(GESHI_HEADER_PRE);
21 --- dokuwiki-2013-02-01/inc/load.php~   2013-01-28 00:59:02.000000000 +0200
22 +++ dokuwiki-2013-02-01/inc/load.php    2013-02-01 01:27:39.317193573 +0200
23 @@ -70,7 +70,7 @@
24          'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
25          'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
26          'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
27 -        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
28 +        'GeSHi'                 => '/usr/share/php/geshi.php',
29          'Tar'                   => DOKU_INC.'inc/Tar.class.php',
30          'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
31          'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
This page took 0.057652 seconds and 3 git commands to generate.