[packages/dokuwiki/DEVEL] mailthreads.patch is applied upstream
glen
glen at pld-linux.org
Wed May 29 17:40:41 CEST 2013
commit 79d978d61fd563dad4233d5f2cb789ebfdd78b73
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 29 18:31:20 2013 +0300
mailthreads.patch is applied upstream
dokuwiki-mailthreads.patch | 49 ----------------------------------------------
dokuwiki.spec | 2 --
2 files changed, 51 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 00e8c87..18c0d41 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -40,7 +40,6 @@ Patch6: %{name}-nice_exit.patch
Patch8: %{name}-notify-respect-minor.patch
Patch10: %{name}-mailtext.patch
Patch11: %{name}-notifyns.patch
-Patch12: %{name}-mailthreads.patch
Patch14: interwiki-outputonly.patch
Patch15: simplepie.patch
Patch19: pld-branding.patch
@@ -144,7 +143,6 @@ touch data/pages/playground/playground.txt
%patch8 -p1
%patch10 -p1
%patch11 -p1
-#%%patch12 -p1 OUTDATED?
%patch14 -p1
%patch15 -p1
%patch19 -p1
diff --git a/dokuwiki-mailthreads.patch b/dokuwiki-mailthreads.patch
deleted file mode 100644
index c3142c5..0000000
--- a/dokuwiki-mailthreads.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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 ($who != 'register') {
-+ $file = wikiFN($id);
-+ $cur = @filemtime($file);
-+
-+ $server = parse_url(DOKU_URL, PHP_URL_HOST);
-+ $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
-+ $listid = strtolower(trim($listid, '.'));
-+
-+ $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false);
-+ if ($rev) {
-+ $mail->setHeader('In-Reply-To', "<$id?rev=$rev@$listid>", false);
-+ }
-+ }
-+
- return $mail->send();
- }
-
---- dokuwiki/./inc/media.php~ 2012-07-30 17:32:21.000000000 +0300
-+++ dokuwiki/./inc/media.php 2012-07-30 17:57:02.763464890 +0300
-@@ -561,6 +544,19 @@
- $mail->to($to);
- $mail->subject($lang['mail_upload'].' '.$id);
- $mail->setBody($text,$trep);
-+
-+ $file = mediaFN($id);
-+ $cur = @filemtime($file);
-+
-+ $server = parse_url(DOKU_URL, PHP_URL_HOST);
-+ $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
-+ $listid = strtolower(trim($listid, '.'));
-+
-+ $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false);
-+ if ($old_rev) {
-+ $mail->setHeader('In-Reply-To', "<$id?rev=$old_rev@$listid>", false);
-+ }
-+
- return $mail->send();
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/79d978d61fd563dad4233d5f2cb789ebfdd78b73
More information about the pld-cvs-commit
mailing list