summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorjake%bugzilla.org <>2005-03-17 06:58:54 +0100
committerjake%bugzilla.org <>2005-03-17 06:58:54 +0100
commit8ef31d2af140f70ad04825ed38007c3078f1c614 (patch)
tree3abd62e43b493142be065efdd84c7acfdffe4801 /Bugzilla
parent8eace84515065387d54ca316b40b975c73621758 (diff)
downloadbugzilla-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 'Bugzilla')
-rw-r--r--Bugzilla/Config.pm12
1 files changed, 0 insertions, 12 deletions
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) {