Bug 852795 - Request emails should include X-Bugzilla-Product, etc headers (fully backport upstream bug 573919)

r=glob

3 files changed, 4 insertions, 30 deletions

diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index 1cbc8864b..7e871c4f8 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -33,19 +33,7 @@ Date: [% date %]
 X-Bugzilla-Reason: [% reasonsheader %]
 X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
-[% IF Param('useclassification') %]
-X-Bugzilla-Classification: [% bug.classification %]
-[% END %]
-X-Bugzilla-Product: [% bug.product %]
-X-Bugzilla-Component: [% bug.component %]
-X-Bugzilla-Keywords: [% bug.keywords %]
-X-Bugzilla-Severity: [% bug.bug_severity %]
-X-Bugzilla-Who: [% changer.login %]
-X-Bugzilla-Status: [% bug.bug_status %]
-X-Bugzilla-Resolution: [% bug.resolution %]
-X-Bugzilla-Priority: [% bug.priority %]
-X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
-X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
 X-Bugzilla-Changed-Field-Names: [% changedfieldnames.join(" ") %]
 [%+ threadingmarker %]
diff --git a/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
index cc254dee2..3f3b7d373 100644
--- a/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -5,26 +5,13 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-
-[% PROCESS "global/field-descs.none.tmpl" %]
-[% PROCESS "global/reason-descs.none.tmpl" %]
-[% isnew = bug.lastdiffed ? 0 : 1 %]
-[% show_new = isnew
-              && (to_user.settings.bugmail_new_prefix.value == 'on') %]
-
-From: [% Param('mailfrom') %]
-To: [% to_user.email %]
-Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
-Date: [% date %]
-X-Bugzilla-Reason: [% reasonsheader %]
-X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
-X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
 [% IF Param('useclassification') %]
 X-Bugzilla-Classification: [% bug.classification %]
 [% END %]
 X-Bugzilla-ID: [% bug.id %]
 X-Bugzilla-Product: [% bug.product %]
 X-Bugzilla-Component: [% bug.component %]
+X-Bugzilla-Version: [% bug.version %]
 X-Bugzilla-Keywords: [% bug.keywords %]
 X-Bugzilla-Severity: [% bug.bug_severity %]
 X-Bugzilla-Who: [% changer.login %]
@@ -33,7 +20,5 @@ X-Bugzilla-Resolution: [% bug.resolution %]
 X-Bugzilla-Priority: [% bug.priority %]
 X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
 X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
 X-Bugzilla-OS: [% bug.op_sys %]
-X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
-X-Bugzilla-Changed-Field-Names: [% changedfieldnames.join(" ") %]
-[%+ threadingmarker %]
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 510741eed..f05059c1a 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -57,6 +57,7 @@ X-Bugzilla-Type: request
 [%- IF flag.requestee %]
 X-Bugzilla-Flag-Requestee: [% flag.requestee.email %]
 [% END %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 [%+ threadingmarker %]
 
 [%+ USE wrap -%]