summaryrefslogtreecommitdiffstats
path: root/template/en/default/account/email
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
committertravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
commit5d6b815d1ce8eece29e22e09781f890375f3c403 (patch)
treebaa11798e9e3fd48fc37db3f8b99ffa0e56cd997 /template/en/default/account/email
parenta54f3f23447038f15de353b3a8642701325b00ec (diff)
downloadbugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.gz
bugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.xz
Bug 135812 : Add a 'mailfrom' parameter to unify bugmail originating address
Patch by Cedric Caron <cedric.caron@urbanet.ch> r=wurblzap a=justdave
Diffstat (limited to 'template/en/default/account/email')
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl3
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl3
2 files changed, 4 insertions, 2 deletions
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 7113504d8..cbc0af1e7 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -22,9 +22,10 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
+X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for the account [% oldemailaddress %] to your address.
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index 272f6d4e5..12de7530d 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -27,12 +27,13 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
Importance: High
X-MSMail-Priority: High
X-Priority: 1
+X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for your account to [%+ newemailaddress %].