- merge update to 20080505 from DEVEL

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

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index 8bb41c18896d671b6886d77622dee559db450f17..e688946cde1e54a901be05ee1350155de89bce4d 100644 (file)
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -1,22 +1,23 @@
---- dokuwiki-2007-06-26b/inc/parserutils.php   2007-06-26 21:27:15.000000000 +0300
-+++ dokuwiki/inc/parserutils.php       2007-11-29 11:47:57.797811307 +0200
-@@ -585,16 +585,16 @@
+--- dokuwiki-2008-05-05/inc/parserutils.php~   2008-05-05 21:34:23.000000000 +0300
++++ dokuwiki-2008-05-05/inc/parserutils.php    2008-05-05 21:37:11.549493756 +0300
+@@ -642,16 +642,16 @@
    $cache = getCacheName($language.$code,".code");
- 
-   if (@file_exists($cache) && !$_REQUEST['purge'] &&
--     (filemtime($cache) > filemtime(DOKU_INC . 'inc/geshi.php'))) {
-+     (filemtime($cache) > filemtime('/usr/share/php/geshi.php'))) {
- 
+   $ctime = @filemtime($cache);
+   if($ctime && !$_REQUEST['purge'] &&
+-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&
+-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&
++     $ctime > filemtime('/usr/share/php/geshi.php') &&
++     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&
+      $ctime > filemtime(DOKU_CONF.'dokuwiki.php')){
      $highlighted_code = io_readFile($cache, false);
-     @touch($cache);
  
    } else {
  
 -    require_once(DOKU_INC . 'inc/geshi.php');
 +    require_once '/usr/share/php/geshi.php';
  
--    $geshi = new GeSHi($code, strtolower($language), DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, strtolower($language));
+-    $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);