From 685776f18291c4c0ee0ce729318b36d025be55f4 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@redhat.com>
Date: Thu, 5 Jun 2014 19:57:59 +0000
Subject: Bug 1016273: Bugzilla whine emails missing change to From header made
 by bug 1010751

---
 template/en/default/email/bugmail-header.txt.tmpl | 2 +-
 template/en/default/email/lockout.txt.tmpl        | 2 +-
 template/en/default/email/sanitycheck.txt.tmpl    | 2 +-
 template/en/default/email/sudo.txt.tmpl           | 2 +-
 template/en/default/email/whine.txt.tmpl          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'template/en/default/email')

diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index efef4057d..679e705cd 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -26,7 +26,7 @@
 [% show_new = isnew
               && (to_user.settings.bugmail_new_prefix.value == 'on') %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% to_user.email %]
 Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
 Date: [% date %]
diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl
index daad4eb98..94e9c74cb 100644
--- a/template/en/default/email/lockout.txt.tmpl
+++ b/template/en/default/email/lockout.txt.tmpl
@@ -20,7 +20,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% Param('maintainer') %]
 Subject: [[% terms.Bugzilla %]] Account Lock-Out: [% locked_user.login %] ([% address %])
 X-Bugzilla-Type: admin
diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl
index a14489f73..8826d4e39 100644
--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/template/en/default/email/sanitycheck.txt.tmpl
@@ -19,7 +19,7 @@
   #%]
 
 [% PROCESS "global/variables.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% addressee %]
 Subject: [[% terms.Bugzilla %]] Sanity Check Results
 X-Bugzilla-Type: sanitycheck
diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl
index a75e03889..74fbc4976 100644
--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -21,7 +21,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 Content-Type: text/plain
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% user.email %]
 Subject: [[% terms.Bugzilla %]] Your account [% user.login -%]
  is being impersonated
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index b249d1964..32d8da8a0 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -19,7 +19,7 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param("mailfrom") %]
 To: [% email %][% Param("emailsuffix") %]
 Subject: Your [% terms.Bugzilla %] [%+ terms.bug %] list needs attention.
 X-Bugzilla-Type: whine
-- 
cgit v1.2.3-24-g4f1b