From ef56c491a65eed9dfddb2866c5faa59acb69b0ed Mon Sep 17 00:00:00 2001
From: "dkl%redhat.com" <>
Date: Thu, 28 Aug 2008 01:38:45 +0000
Subject: =?UTF-8?q?Bug=20449791=20=C3=A2=C2=80=C2=93=20Allow=20flag=20noti?=
 =?UTF-8?q?fication=20emails=20to=20be=20threaded=20similar=20to=20normal?=
 =?UTF-8?q?=20bug=20change=20emails=20Patch=20by=20Dave=20Lawrence=20<dkl@?=
 =?UTF-8?q?redhat.com>=20-=20r/a=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Flag.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Bugzilla/Flag.pm')

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 73266ce9f..8201a907d 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -1104,10 +1104,15 @@ sub notify {
     }
 
     foreach my $to (keys %recipients) {
-        my $vars = { 'flag'       => $flag,
-                     'to'         => $to,
-                     'bug'        => $bug,
-                     'attachment' => $attachment};
+        # Add threadingmarker to allow flag notification emails to be the
+        # threaded similar to normal bug change emails.
+        my $thread_user_id = $recipients{$to} ? $recipients{$to}->id : 0;
+    
+        my $vars = { 'flag'            => $flag,
+                     'to'              => $to,
+                     'bug'             => $bug,
+                     'attachment'      => $attachment,
+                     'threadingmarker' => build_thread_marker($bug->id, $thread_user_id) };
 
         my $lang = $recipients{$to} ?
           $recipients{$to}->settings->{'lang'}->{'value'} : $default_lang;
-- 
cgit v1.2.1