From 3af2a748f631ca349daee12f7c3c26a8fb831219 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 3 Jan 2014 08:24:16 +1000
Subject: Bug 946565 - Bug Mail does not correct notify when two people have
 made changes r=LpSolit, a=simon

---
 Bugzilla/BugMail.pm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index bdbc21e5a..6c7be5e12 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -89,15 +89,17 @@ sub Send {
 
     if ($params->{dep_only}) {
         push(@diffs, { field_name => 'bug_status',
-                       old => $params->{changes}->{bug_status}->[0],
-                       new => $params->{changes}->{bug_status}->[1],
+                       old        => $params->{changes}->{bug_status}->[0],
+                       new        => $params->{changes}->{bug_status}->[1],
                        login_name => $changer->login,
-                       blocker => $params->{blocker} },
+                       who        => $changer,
+                       blocker    => $params->{blocker} },
                      { field_name => 'resolution',
-                       old => $params->{changes}->{resolution}->[0],
-                       new => $params->{changes}->{resolution}->[1],
+                       old        => $params->{changes}->{resolution}->[0],
+                       new        => $params->{changes}->{resolution}->[1],
                        login_name => $changer->login,
-                       blocker => $params->{blocker} });
+                       who        => $changer,
+                       blocker    => $params->{blocker} });
     }
     else {
         push(@diffs, _get_diffs($bug, $end, \%user_cache));
@@ -566,7 +568,10 @@ sub _get_new_bugmail_fields {
         # If there isn't anything to show, don't include this header.
         next unless $value;
 
-        push(@diffs, {field_name => $name, new => $value});
+        push(@diffs, {
+            field_name => $name,
+            who        => $bug->reporter,
+            new        => $value});
     }
 
     return @diffs;
-- 
cgit v1.2.3-24-g4f1b