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/email/change-new.txt.tmpl | 3 +--
 template/en/default/account/email/change-old.txt.tmpl | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

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

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 %].
-- 
cgit v1.2.3-24-g4f1b