summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@redhat.com>2014-06-05 21:57:59 +0200
committerDavid Lawrence <dkl@redhat.com>2014-06-05 21:58:22 +0200
commit685776f18291c4c0ee0ce729318b36d025be55f4 (patch)
tree109c8600d26ec11bf9b57cfe2745b1a4957940c3 /extensions
parentac9980ad764eeaadca73a73cdcab554587135629 (diff)
downloadbugzilla-685776f18291c4c0ee0ce729318b36d025be55f4.tar.gz
bugzilla-685776f18291c4c0ee0ce729318b36d025be55f4.tar.xz
Bug 1016273: Bugzilla whine emails missing change to From header made by bug 1010751
Diffstat (limited to 'extensions')
-rw-r--r--extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl2
-rw-r--r--extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl2
-rw-r--r--extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl2
-rw-r--r--extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
index e85c76efd..8ad9d6cb1 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
+++ b/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] Your Overdue Requests
([% FOREACH type = requests.item(recipient.email).typelist %]
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
index b7ea261c6..261e92f13 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
+++ b/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] Overdue Requests Report
Date: [% date %]
diff --git a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
index 7298e686e..e4f4c9242 100644
--- a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
+++ b/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS global/variables.none.tmpl %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
To: [% to_user %]
Subject: [% terms.Bugzilla %] SecureMail Test Email
X-Bugzilla-Type: securemail-test
diff --git a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
index 2e1de2a5c..bfb37c90d 100644
--- a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
+++ b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
@@ -20,7 +20,7 @@
[% PROCESS global/variables.none.tmpl %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
To: [% to %]
Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
X-Bugzilla-Type: voteremoved