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.

---
 Bugzilla/Config.pm | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'Bugzilla/Config.pm')

diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index c1c317d57..6bc149be9 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -251,18 +251,6 @@ sub UpdateParams {
         delete $param{'enablequips'};
     }
 
-    # Update e-mail text to use new mailfrom param (Bug 135812)
-    if (!exists $param{'mailfrom'}) {
-        $param{'passwordmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
-        $param{'passwordmail'} =~ s/\n\n/\nX-Bugzilla-Type: admin\n\n/;
-        $param{'newchangedmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
-        $param{'newchangedmail'} =~ s/\n\n/\nX-Bugzilla-Type: newchanged\n\n/;
-        $param{'voteremovedmail'} =~ s/^From: bugzilla-daemon$/From: %mailfrom%/mi;
-        $param{'voteremovedmail'} =~ s/\n\n/\nX-Bugzilla-Type: voteremoved\n\n/;
-        $param{'whinemail'} =~ s/^From: %maintainer%$/From: %mailfrom%/mi;
-        $param{'whinemail'} =~ s/\n\n/\nX-Bugzilla-Type: whine\n\n/;
-    }
-
     # --- DEFAULTS FOR NEW PARAMS ---
 
     foreach my $item (@param_list) {
-- 
cgit v1.2.3-24-g4f1b