dokuwiki-geshi.patch

   1 --- dokuwiki-rc2010-10-07/inc/parserutils.php~  2010-10-07 21:21:37.000000000 +0300
   2 +++ dokuwiki-rc2010-10-07/inc/parserutils.php   2010-10-07 21:24:30.142987536 +0300
   3 @@ -634,14 +634,14 @@
   4      $cache = getCacheName($language.$code,".code");
   5      $ctime = @filemtime($cache);
   6      if($ctime && !$_REQUEST['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-rc2010-10-07/inc/load.php~ 2010-10-07 11:08:13.000000000 +0300
  22 +++ dokuwiki-rc2010-10-07/inc/load.php  2010-10-07 21:23:57.072781806 +0300
  23 @@ -68,7 +68,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          'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
  30          'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
  31          'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',