- export to pdf also for dw2pdf plugin

[packages/dokuwiki.git] / dokuwiki-geshi.patch

--- dokuwiki-rc2010-10-07/inc/parserutils.php~	2010-10-07 21:21:37.000000000 +0300
+++ dokuwiki-rc2010-10-07/inc/parserutils.php	2010-10-07 21:24:30.142987536 +0300
@@ -634,14 +634,14 @@
     $cache = getCacheName($language.$code,".code");
     $ctime = @filemtime($cache);
     if($ctime && !$_REQUEST['purge'] &&
-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
+            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition 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);
--- dokuwiki-rc2010-10-07/inc/load.php~	2010-10-07 11:08:13.000000000 +0300
+++ dokuwiki-rc2010-10-07/inc/load.php	2010-10-07 21:23:57.072781806 +0300
@@ -68,7 +68,7 @@
         'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
         'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
         'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
-        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
+        'GeSHi'                 => '/usr/share/php/geshi.php',
         'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
         'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
         'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',