diff options
| author | byron jones <byron@glob.com.au> | 2018-03-26 23:01:46 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-03-27 13:42:01 +0200 |
| commit | f6a6e63306e63825013f9a58b7527f2653420976 (patch) | |
| tree | 37875f0045306134011d6a31eaf6bc2ed95e9d2e /Bugzilla | |
| parent | cb4587c87649fbafd5108e035cd4f5282dd4b418 (diff) | |
| download | bugzilla-f6a6e63306e63825013f9a58b7527f2653420976.tar.gz bugzilla-f6a6e63306e63825013f9a58b7527f2653420976.tar.xz | |
Bug 1448681 - Bugmail Message-ID header format changed without changing In-Reply-To/References, breaking threading
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Mailer.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm index e245a05e0..1dec3d4ff 100644 --- a/Bugzilla/Mailer.pm +++ b/Bugzilla/Mailer.pm @@ -252,15 +252,14 @@ sub build_thread_marker { $sitespec = "-$2$sitespec"; # Put the port number back in, before the '@' } - my $threadingmarker; + my $threadingmarker = "References: <bug-$bug_id-$user_id$sitespec>"; if ($is_new) { - $threadingmarker = "Message-ID: <bug-$bug_id-$user_id$sitespec>"; + $threadingmarker .= "\nMessage-ID: <bug-$bug_id-$user_id$sitespec>"; } else { my $rand_bits = generate_random_password(10); - $threadingmarker = "Message-ID: <bug-$bug_id-$user_id-$rand_bits$sitespec>" . - "\nIn-Reply-To: <bug-$bug_id-$user_id$sitespec>" . - "\nReferences: <bug-$bug_id-$user_id$sitespec>"; + $threadingmarker .= "\nMessage-ID: <bug-$bug_id-$user_id-$rand_bits$sitespec>" . + "\nIn-Reply-To: <bug-$bug_id-$user_id$sitespec>"; } return $threadingmarker; |