SOURCES (DEVEL): dokuwiki-geshi.patch, dokuwiki-config.patch - upd...

[glen]

Author: glen                         Date: Mon May  5 18:38:12 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- update to 2008-05-05

---- Files affected:
SOURCES:
   dokuwiki-geshi.patch (1.1 -> 1.1.2.1) , dokuwiki-config.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/dokuwiki-geshi.patch
diff -u SOURCES/dokuwiki-geshi.patch:1.1 SOURCES/dokuwiki-geshi.patch:1.1.2.1
--- SOURCES/dokuwiki-geshi.patch:1.1	Thu Nov 29 11:14:43 2007
+++ SOURCES/dokuwiki-geshi.patch	Mon May  5 20:38:06 2008
@@ -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);

================================================================
Index: SOURCES/dokuwiki-config.patch
diff -u SOURCES/dokuwiki-config.patch:1.1.2.1 SOURCES/dokuwiki-config.patch:1.1.2.2
--- SOURCES/dokuwiki-config.patch:1.1.2.1	Tue Apr  1 07:11:05 2008
+++ SOURCES/dokuwiki-config.patch	Mon May  5 20:38:07 2008
@@ -12,14 +12,14 @@
  $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
  
  /* Display Options */
---- dokuwiki-rc2008-03-31/install.php~	2008-04-01 07:55:37.000000000 +0300
-+++ dokuwiki-rc2008-03-31/install.php	2008-04-01 07:56:58.574065063 +0300
-@@ -43,7 +43,7 @@
-     '2006-11-06'   => 'b3a8af76845977c2000d85d6990dd72b',
+--- dokuwiki-2008-05-05/install.php~	2008-05-05 21:33:44.000000000 +0300
++++ dokuwiki-2008-05-05/install.php	2008-05-05 21:33:49.877839346 +0300
+@@ -44,6 +44,8 @@
      '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
      '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
--    'rc2007-03-31' => '1e5c42eac3219d9e21927c39e3240aad',
-+    'rc2007-03-31-pld' => 'b3f453c8e68e7a06c312c230f35bcdd3',
+     '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
++	# md5sum -b conf/dokuwiki.php
++    '2008-05-04-pld'   => 'b3f453c8e68e7a06c312c230f35bcdd3',
  );
  
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-geshi.patch?r1=1.1&r2=1.1.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dokuwiki-config.patch?r1=1.1.2.1&r2=1.1.2.2&f=u