From 8ef31d2af140f70ad04825ed38007c3078f1c614 Mon Sep 17 00:00:00 2001 From: "jake%bugzilla.org" <> Date: Thu, 17 Mar 2005 05:58:54 +0000 Subject: Backing out the fix for bug 135812 as it causes the mail params to be deleted on new installs. --- template/en/default/account/cancel-token.txt.tmpl | 3 +-- template/en/default/account/email/change-new.txt.tmpl | 3 +-- template/en/default/account/email/change-old.txt.tmpl | 3 +-- template/en/default/account/password/forgotten-password.txt.tmpl | 3 +-- template/en/default/request/email.txt.tmpl | 3 +-- template/en/default/whine/multipart-mime.txt.tmpl | 1 - 6 files changed, 5 insertions(+), 11 deletions(-) (limited to 'template/en') diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 38ad37bef..de2278419 100644 --- a/template/en/default/account/cancel-token.txt.tmpl +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -22,10 +22,9 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: bugzilla-admin-daemon To: [% emailaddress %] Subject: [% PROCESS subject %] -X-B[%#%]ugzilla-Type: admin A request was cancelled from [% remoteaddress %]. diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index cbc0af1e7..7113504d8 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -22,10 +22,9 @@ [% PROCESS global/variables.none.tmpl %] [% expiration_ts = token_ts + (max_token_age * 86400) %] -From: [% Param('mailfrom') %] +From: bugzilla-admin-daemon 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 12de7530d..272f6d4e5 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -27,13 +27,12 @@ [% PROCESS global/variables.none.tmpl %] [% expiration_ts = token_ts + (max_token_age * 86400) %] -From: [% Param('mailfrom') %] +From: bugzilla-admin-daemon 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 %]. diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index b56e930fd..5ac3ed75c 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -22,10 +22,9 @@ [% PROCESS global/variables.none.tmpl %] [% expiration_ts = token_ts + (max_token_age * 86400) %] -From: [% Param('mailfrom') %] +From: bugzilla-admin-daemon To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Password Request -X-B[%#%]ugzilla-Type: admin You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index f34227a56..719f9d869 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -36,11 +36,10 @@ [% to_identity = flag.setter.identity _ "'s request" %] [% subject_status = statuses.${flag.status} %] [% END %] -From: [% Param('mailfrom') %] +From: bugzilla-request-daemon To: [% to_email %] CC: [% flag.type.cc_list %] Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %] -X-B[%#%]ugzilla-Type: request [%- IF flag.target.attachment.exists %] : [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/multipart-mime.txt.tmpl index 855cbd066..5e597d899 100644 --- a/template/en/default/whine/multipart-mime.txt.tmpl +++ b/template/en/default/whine/multipart-mime.txt.tmpl @@ -34,7 +34,6 @@ From: [% from %] To: [% recipient.email %] Subject: [[% terms.Bugzilla %]] [% subject %] -X-B[%#%]ugzilla-Type: whine MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="[% boundary %]" -- cgit v1.2.3-24-g4f1b