Bug 70710: More expandable tags within emails - Patch by Alan Siu-Lung Tam <Tam@SiuLu...

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 89bebaab368effeca2144b23442cb273fd05f953..4d151cd7f23bd4d9b97d4d15bccfcb0537df6360 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -246,6 +246,7 @@ sub ProcessOneBug {
     my $diffheader = "";
     my @diffparts;
     my $lastwho = "";
+    my @changedfields;
     foreach my $ref (@$diffs) {
         my ($who, $what, $when, $old, $new, $attachid, $fieldname) = (@$ref);
         my $diffpart = {};
@@ -271,7 +272,9 @@ sub ProcessOneBug {
         $diffpart->{'fieldname'} = $fieldname;
         $diffpart->{'text'} = $difftext;
         push(@diffparts, $diffpart);
+        push(@changedfields, $what);
     }
+    $values{'changed_fields'} = join(' ', @changedfields);
 
     my $deptext = "";
 
@@ -625,6 +628,11 @@ sub sendMail {
     $substs{"component"} = $values{'component'};
     $substs{"keywords"} = $values{'keywords'};
     $substs{"severity"} = $values{'bug_severity'};
+    $substs{"status"} = $values{'bug_status'};
+    $substs{"priority"} = $values{'priority'};
+    $substs{"assignedto"} = $values{'assigned_to'};
+    $substs{"targetmilestone"} = $values{'target_milestone'};
+    $substs{"changedfields"} = $values{'changed_fields'};
     $substs{"summary"} = $values{'short_desc'};
     my (@headerrel, @watchingrel);
     while (my ($rel, $bits) = each %{$relRef}) {

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index d74e2cc00f0b95fcb27935309028c201988508c3..47370d34e4e41c5eef5502ac27ffa5a054e7e417 100644 (file)
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -76,6 +76,11 @@ X-Bugzilla-Component: %component%
 X-Bugzilla-Keywords: %keywords%
 X-Bugzilla-Severity: %severity%
 X-Bugzilla-Who: %changer%
+X-Bugzilla-Status: %status%
+X-Bugzilla-Priority: %priority%
+X-Bugzilla-Assigned-To: %assignedto%
+X-Bugzilla-Target-Milestone: %targetmilestone%
+X-Bugzilla-Changed-Fields: %changedfields%
 
 %urlbase%show_bug.cgi?id=%bugid%