Bug 135812 : Add a 'mailfrom' parameter to unify bugmail originating address
Patch by Cedric Caron <cedric.caron@urbanet.ch> r=wurblzap a=justdave git-svn-id: svn://10.0.0.236/trunk@170708 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -251,6 +251,18 @@ 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) {
|
||||
|
||||
Reference in New Issue
Block a user