summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Mailer.pm
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-04-01 16:46:28 +0200
committerDylan William Hardison <dylan@hardison.net>2018-04-01 16:46:28 +0200
commit2f8b999750cc700faf03c6aee1c53d1fc4df767f (patch)
treeef00bf6fd9932fd4fa1fc69e3108a1c5603aa64a /Bugzilla/Mailer.pm
parentc6d0d0e31a8b7b0e3c46ddf0a2be7741716d7977 (diff)
parent45485679f2e173170ed9c0e8a0eae979fe9de067 (diff)
downloadbugzilla-2f8b999750cc700faf03c6aee1c53d1fc4df767f.tar.gz
bugzilla-2f8b999750cc700faf03c6aee1c53d1fc4df767f.tar.xz
Merge branch 'master' of git://github.com/mozilla-bteam/bmo
Diffstat (limited to 'Bugzilla/Mailer.pm')
-rw-r--r--Bugzilla/Mailer.pm9
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;