From ef56c491a65eed9dfddb2866c5faa59acb69b0ed Mon Sep 17 00:00:00 2001
From: "dkl%redhat.com" <>
Date: Thu, 28 Aug 2008 01:38:45 +0000
Subject: Bug 449791 – Allow flag notification emails to be threaded similar to
 normal bug change emails Patch by Dave Lawrence <dkl@redhat.com> -
 r/a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/BugMail.pm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'Bugzilla/BugMail.pm')

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 20bb7e254..4e91d4be4 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -636,22 +636,6 @@ sub sendMail {
     push(@watchingrel, 'None') unless @watchingrel;
     push @watchingrel, map { user_id_to_login($_) } @$watchingRef;
 
-    my $sitespec = '@' . Bugzilla->params->{'urlbase'};
-    $sitespec =~ s/:\/\//\./; # Make the protocol look like part of the domain
-    $sitespec =~ s/^([^:\/]+):(\d+)/$1/; # Remove a port number, to relocate
-    if ($2) {
-        $sitespec = "-$2$sitespec"; # Put the port number back in, before the '@'
-    }
-    my $threadingmarker;
-    if ($isnew) {
-        $threadingmarker = "Message-ID: <bug-$id-" . $user->id . "$sitespec>";
-    }
-    else {
-        $threadingmarker = "In-Reply-To: <bug-$id-" . $user->id . "$sitespec>" .
-                            "\nReferences: <bug-$id-" . $user->id . "$sitespec>";
-    }
-    
-
     my $vars = {
         isnew => $isnew,
         to => $user->email,
@@ -678,7 +662,7 @@ sub sendMail {
         reporter => $values{'reporter'},
         reportername => Bugzilla::User->new({name => $values{'reporter'}})->name,
         diffs => $diffs,
-        threadingmarker => $threadingmarker
+        threadingmarker => build_thread_marker($id, $user->id, $isnew),
     };
 
     my $msg;
-- 
cgit v1.2.3-24-g4f1b