[packages/dokuwiki] rediff from PR: https://github.com/splitbrain/dokuwiki/pull/120

[glen]

commit 9d71c313e51a61d38139faf3091fc1621d98bd36
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jul 30 17:57:37 2012 +0300

    rediff from PR: https://github.com/splitbrain/dokuwiki/pull/120

 dokuwiki-mailthreads.patch | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/dokuwiki-mailthreads.patch b/dokuwiki-mailthreads.patch
index 7751ea0..83e89de 100644
--- a/dokuwiki-mailthreads.patch
+++ b/dokuwiki-mailthreads.patch
@@ -1,10 +1,14 @@
---- dokuwiki-2012-07-16/inc/common.php	2012-07-16 00:20:31.431313996 +0300
-+++ dokuwiki-2012-07-19/inc/common.php	2012-07-19 19:13:50.094210050 +0300
-@@ -1215,2 +1215,18 @@
+diff --git a/inc/common.php b/inc/common.php
+index 02ed243..befc3e1 100644
+--- a/inc/common.php
++++ b/inc/common.php
+@@ -1181,6 +1181,22 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace =
+             false
+         );
      }
 +
 +    // add mail headers to identify page changes in same mail thread
-+    if ($conf['mailthreads'] && $who != 'register') {
++    if ($who != 'register') {
 +        $file = wikiFN($id);
 +        $cur = @filemtime($file);
 +
@@ -19,33 +23,5 @@
 +    }
 +
      return $mail->send();
---- dokuwiki/conf/dokuwiki.php~	2012-07-19 09:02:02.000000000 +0300
-+++ dokuwiki/conf/dokuwiki.php	2012-07-19 19:12:53.031815276 +0300
-@@ -113,6 +113,7 @@
- $conf['mailfrom']    = '';               //use this email when sending mails
- $conf['mailprefix']  = '';               //use this as prefix of outgoing mails
- $conf['htmlmail']    = 1;                //send HTML multipart mails
-+$conf['mailthreads'] = 1;                //add threading headers to page change notification mails
+ }
  
- /* Syndication Settings */
- $conf['sitemap']     = 0;                //Create a google sitemap? How often? In days.
---- dokuwiki/lib/plugins/config/settings/config.metadata.php~	2012-07-15 23:56:17.000000000 +0300
-+++ dokuwiki/lib/plugins/config/settings/config.metadata.php	2012-07-19 19:15:54.789443307 +0300
-@@ -178,6 +178,7 @@
- $meta['mailfrom']       = array('richemail');
- $meta['mailprefix']     = array('string');
- $meta['htmlmail']       = array('onoff');
-+$meta['mailthreads']    = array('onoff');
- 
- $meta['_syndication'] = array('fieldset');
- $meta['sitemap']     = array('numeric');
---- dokuwiki/lib/plugins/config/lang/en/lang.php~	2012-07-19 19:17:16.000000000 +0300
-+++ dokuwiki/lib/plugins/config/lang/en/lang.php	2012-07-19 19:17:19.673005805 +0300
-@@ -148,6 +148,7 @@
- $lang['mailfrom']    = 'Sender email address to use for automatic mails';
- $lang['mailprefix']  = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title';
- $lang['htmlmail']    = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.';
-+$conf['mailthreads'] = 'Add threading headers to page change notification mails';
- 
- /* Syndication Settings */
- $lang['sitemap']     = 'Generate Google sitemap this often (in days). 0 to disable';