From e5b7b6f03e35bae38c65b2e2a8c20b333b063ac9 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net"
 <jocuri%softhome.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Feb 2006 21:41:01 +0000
Subject: [PATCH] Patch for bug 137261: Add X-Bugzilla-Who: an email header
 specifying the bugzilla account that made these changes; patch by Albert Ting
 <altlst@sonic.net>, r=LpSolit, a=justdave.

git-svn-id: svn://10.0.0.236/trunk@190745 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bugzilla/BugMail.pm    | 4 ++++
 mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm | 1 +
 2 files changed, 5 insertions(+)

diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
index e4a19d65fb6..f065cb5fc2a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
@@ -187,6 +187,8 @@ sub ProcessOneBug {
     }
     
     # Convert to names, for later display
+    $values{'changer'} = $changer;
+    $values{'changername'} = Bugzilla::User->new_from_login($changer)->name;
     $values{'assigned_to'} = &::DBID_to_name($values{'assigned_to'});
     $values{'reporter'} = &::DBID_to_name($values{'reporter'});
     if ($values{'qa_contact'}) {
@@ -610,6 +612,8 @@ sub sendMail {
     $substs{"reasonsheader"} = join(" ", map { $rel_names{$_} } @$relRef);
     $substs{"reasonsbody"} = $reasonsbody;
     $substs{"space"} = " ";
+    $substs{"changer"} = $values{'changer'};
+    $substs{"changername"} = $values{'changername'};
     if ($isnew) {
         $substs{'threadingmarker'} = "Message-ID: <bug-$id-" . 
                                      $user->id . "$sitespec>";
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
index 50aa8c85d21..4d2cd670395 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
@@ -91,6 +91,7 @@ X-Bugzilla-Product: %product%
 X-Bugzilla-Component: %component%
 X-Bugzilla-Keywords: %keywords%
 X-Bugzilla-Severity: %severity%
+X-Bugzilla-Who: %changer%
 
 %urlbase%show_bug.cgi?id=%bugid%