]>
Commit | Line | Data |
---|---|---|
9d71c313 ER |
1 | diff --git a/inc/common.php b/inc/common.php |
2 | index 02ed243..befc3e1 100644 | |
3 | --- a/inc/common.php | |
4 | +++ b/inc/common.php | |
5 | @@ -1181,6 +1181,22 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = | |
6 | false | |
7 | ); | |
ba591ec8 | 8 | } |
4b73b5a6 | 9 | + |
c4df8b0c | 10 | + // add mail headers to identify page changes in same mail thread |
9d71c313 | 11 | + if ($who != 'register') { |
81b48df2 ER |
12 | + $file = wikiFN($id); |
13 | + $cur = @filemtime($file); | |
14 | + | |
15 | + $server = parse_url(DOKU_URL, PHP_URL_HOST); | |
16 | + $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server; | |
17 | + $listid = strtolower(trim($listid, '.')); | |
18 | + | |
074a4d63 | 19 | + $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false); |
81b48df2 | 20 | + if ($rev) { |
074a4d63 | 21 | + $mail->setHeader('In-Reply-To', "<$id?rev=$rev@$listid>", false); |
81b48df2 | 22 | + } |
c4df8b0c | 23 | + } |
45262532 | 24 | + |
4e1fe290 | 25 | return $mail->send(); |
9d71c313 | 26 | } |
81b48df2 | 27 | |
28ed6fc5 ER |
28 | --- dokuwiki/./inc/media.php~ 2012-07-30 17:32:21.000000000 +0300 |
29 | +++ dokuwiki/./inc/media.php 2012-07-30 17:57:02.763464890 +0300 | |
30 | @@ -561,6 +544,19 @@ | |
31 | $mail->to($to); | |
32 | $mail->subject($lang['mail_upload'].' '.$id); | |
33 | $mail->setBody($text,$trep); | |
34 | + | |
35 | + $file = mediaFN($id); | |
36 | + $cur = @filemtime($file); | |
37 | + | |
38 | + $server = parse_url(DOKU_URL, PHP_URL_HOST); | |
39 | + $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server; | |
40 | + $listid = strtolower(trim($listid, '.')); | |
41 | + | |
42 | + $mail->setHeader('Message-Id', "<$id?rev=$cur@$listid>", false); | |
43 | + if ($old_rev) { | |
44 | + $mail->setHeader('In-Reply-To', "<$id?rev=$old_rev@$listid>", false); | |
45 | + } | |
46 | + | |
47 | return $mail->send(); | |
48 | } | |
49 |