Bug 1016273: Bugzilla whine emails missing change to From header made by bug 1010751

Author: David Lawrence

email_in.pl

@@ -387,8 +387,7 @@ sub die_handler {
        $msg =~ s/at .+ line.*$//ms;
        $msg =~ s/^Compilation failed in require.+$//ms;
        $msg = html_strip($msg);
-       my $from = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
-                  ' <' . Bugzilla->params->{'mailfrom'} . '>';
+       my $from = Bugzilla->params->{'mailfrom'};
        my $reply = reply(to => $input_email, from => $from, top_post => 1, 
                          body => "$msg\n");
        MessageToMTA($reply->as_string);

extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl

@@ -8,7 +8,7 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% PROCESS "global/reason-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% recipient.email %]
 Subject: [[% terms.Bugzilla %]] Your Overdue Requests
   ([% FOREACH type = requests.item(recipient.email).typelist %]

extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl

@@ -8,7 +8,7 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% PROCESS "global/reason-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% recipient.email %]
 Subject: [[% terms.Bugzilla %]] Overdue Requests Report
 Date: [% date %]

extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl

@@ -8,7 +8,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% to_user %]
 Subject: [% terms.Bugzilla %] SecureMail Test Email
 X-Bugzilla-Type: securemail-test

extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl

@@ -20,7 +20,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
 X-Bugzilla-Type: voteremoved

importxml.pl

@@ -133,8 +133,7 @@ sub MailMessage {
     my $subject    = shift;
     my $message    = shift;
     my @recipients = @_;
-    my $from = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
-               ' <' . Bugzilla->params->{'mailfrom'} . '>';
+    my $from   = $params->{"mailfrom"};
     $from =~ s/@/\@/g;
 
     foreach my $to (@recipients){

template/en/default/account/cancel-token.txt.tmpl

@@ -21,7 +21,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% PROCESS subject %]
 X-Bugzilla-Type: admin

template/en/default/account/email/change-new.txt.tmpl

@@ -20,7 +20,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
 X-Bugzilla-Type: admin

template/en/default/account/email/change-old.txt.tmpl

@@ -25,7 +25,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
 Importance: High

template/en/default/account/email/request-new.txt.tmpl

@@ -21,7 +21,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% email %]
 Subject: [% terms.Bugzilla %]: confirm account creation
 X-Bugzilla-Type: admin