diff options
| author | jake%bugzilla.org <> | 2005-03-17 06:58:54 +0100 |
|---|---|---|
| committer | jake%bugzilla.org <> | 2005-03-17 06:58:54 +0100 |
| commit | 8ef31d2af140f70ad04825ed38007c3078f1c614 (patch) | |
| tree | 3abd62e43b493142be065efdd84c7acfdffe4801 /template/en/default/account | |
| parent | 8eace84515065387d54ca316b40b975c73621758 (diff) | |
| download | bugzilla-8ef31d2af140f70ad04825ed38007c3078f1c614.tar.gz bugzilla-8ef31d2af140f70ad04825ed38007c3078f1c614.tar.xz | |
Backing out the fix for bug 135812 as it causes the mail params to be deleted on new installs.
Diffstat (limited to 'template/en/default/account')
4 files changed, 4 insertions, 8 deletions
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: |