- merge update to 20080505 from DEVEL

Changed files:
    dokuwiki-config.patch -> 1.2
    dokuwiki-geshi.patch -> 1.2
    dokuwiki-mailtext.patch -> 1.2
    dokuwiki-paths.patch -> 1.3

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index fa4592fae1bb42942b212c30bb071d607c25a169..523becdf9ab1061dee8d32bceea8276841fd05df 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -12,13 +12,14 @@ you need to update checksum when you modify docuwiki.php
  $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
  
  /* Display Options */
---- dokuwiki/install.php~      2007-08-19 19:43:02.000000000 +0300
-+++ dokuwiki/install.php       2007-08-19 19:43:05.005347572 +0300
-@@ -44,6 +44,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',
-+    '2007-06-26-pld'   => 'aa124bdad96ae97f3b8c0643913b9cbf',
+     '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
++      # md5sum -b conf/dokuwiki.php
++    '2008-05-04-pld'   => '12f43c697bd6405854685c2cb4aaeaad',
  );
  
  

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);

diff --git a/dokuwiki-mailtext.patch b/dokuwiki-mailtext.patch
index 8c46236416417321e4367e8b98d9df2ad85857a6..74d47924c6b0ed6e7d6360c40822cec8484e4793 100644 (file)
--- a/dokuwiki-mailtext.patch
+++ b/dokuwiki-mailtext.patch
@@ -1,6 +1,6 @@
---- dokuwiki-2007-06-26b/inc/lang/en/mailtext.txt~     2007-06-26 21:27:15.000000000 +0300
-+++ dokuwiki-2007-06-26b/inc/lang/en/mailtext.txt      2008-04-14 11:14:28.000000000 +0300
-@@ -1,17 +1,9 @@
+--- dokuwiki-2008-05-05/inc/lang/en/mailtext.txt~      2008-08-18 21:00:26.000000000 +0300
++++ dokuwiki-2008-05-05/inc/lang/en/mailtext.txt       2008-08-18 21:01:33.357452202 +0300
+@@ -1,14 +1,7 @@
 -A page in your DokuWiki was added or changed. Here are the details:
 -
 -Date        : @DATE@
@@ -17,8 +17,4 @@
 ++++ @NEWPAGE@
  @DIFF@
  
--
----
-+-- 
- This mail was generated by DokuWiki at
- @DOKUWIKIURL@
+ 

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 750525b62ba6a670a9ee650a8a1fb83113d6044f..cce48c518f2e8c50ed16bb3405224e08bf8f648e 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -1,9 +1,20 @@
---- dokuwiki/install.php       2007-08-06 21:55:56.000000000 +0300
-+++ dokuwiki/install.php       2007-08-19 19:35:23.079790781 +0300
+--- dokuwiki-rc2008-03-31/inc/init.php 2008-03-31 20:11:17.000000000 +0200
++++ dokuwiki-rc2008-03-31.new/inc/init.php     2008-04-01 09:44:54.001374243 +0200
+@@ -14,7 +14,7 @@
+   if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+ 
+   // define config path (packagers may want to change this to /etc/dokuwiki/)
+-  if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
++  if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
+ 
+   // check for error reporting override or set error reporting to sane values
+   if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
+--- dokuwiki-rc2008-03-31.new/install.php      2008-04-01 09:44:43.367532550 +0200
++++ dokuwiki-2008-05-05/install.php    2008-05-05 22:20:26.943391311 +0300
 @@ -6,8 +6,9 @@
   */
  
- if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/');
+ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
 -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
 -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
 +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
@@ -12,7 +23,7 @@
  
  // check for error reporting override or set error reporting to sane values
  if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
-@@ -388,14 +389,14 @@
+@@ -389,15 +390,15 @@
  
      $dirs = array(
          'conf'      => DOKU_LOCAL,
@@ -24,6 +35,7 @@
 -        'cache'     => DOKU_INC.'data/cache',
 -        'locks'     => DOKU_INC.'data/locks',
 -        'index'     => DOKU_INC.'data/index',
+-        'tmp'       => DOKU_INC.'data/tmp'
 +        'data'      => DOKU_DATA,
 +        'pages'     => DOKU_DATA.'/pages',
 +        'attic'     => DOKU_DATA.'/attic',
@@ -32,17 +44,7 @@
 +        'cache'     => DOKU_DATA.'/cache',
 +        'locks'     => DOKU_DATA.'/locks',
 +        'index'     => DOKU_DATA.'/index',
++        'tmp'       => DOKU_DATA.'/tmp'
      );
  
      $ok = true;
---- dokuwiki/inc/init.php~     2007-06-26 21:27:15.000000000 +0300
-+++ dokuwiki/inc/init.php      2007-08-19 19:37:26.734809055 +0300
-@@ -14,7 +14,7 @@
-   if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
- 
-   // define config path (packagers may want to change this to /etc/dokuwiki/)
--  if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
-+  if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
- 
-   // check for error reporting override or set error reporting to sane values
-   if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {