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

18 files changed, 18 insertions, 21 deletions

diff --git a/email_in.pl b/email_in.pl
index 928758a9e..34e57c90c 100755
--- a/email_in.pl
+++ b/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);
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
index e85c76efd..8ad9d6cb1 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
+++ b/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 %]
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
index b7ea261c6..261e92f13 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
+++ b/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 %]
diff --git a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
index 7298e686e..e4f4c9242 100644
--- a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
+++ b/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
diff --git a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
index 2e1de2a5c..bfb37c90d 100644
--- a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
+++ b/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
diff --git a/importxml.pl b/importxml.pl
index e4eeb014f..19be9a61a 100755
--- a/importxml.pl
+++ b/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){
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index c3b6012a6..6619dedd3 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/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
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index eeedaf07b..b40ab9852 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/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
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index db08ecba9..ee66c0f24 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/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
diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl
index fd20d08c6..8fb36926f 100644
--- a/template/en/default/account/email/request-new.txt.tmpl
+++ b/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
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index 1c80d0934..e014658dc 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.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 Password Request
 X-Bugzilla-Type: admin
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index efef4057d..679e705cd 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -26,7 +26,7 @@
 [% show_new = isnew
               && (to_user.settings.bugmail_new_prefix.value == 'on') %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% to_user.email %]
 Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
 Date: [% date %]
diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl
index daad4eb98..94e9c74cb 100644
--- a/template/en/default/email/lockout.txt.tmpl
+++ b/template/en/default/email/lockout.txt.tmpl
@@ -20,7 +20,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% Param('maintainer') %]
 Subject: [[% terms.Bugzilla %]] Account Lock-Out: [% locked_user.login %] ([% address %])
 X-Bugzilla-Type: admin
diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl
index a14489f73..8826d4e39 100644
--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/template/en/default/email/sanitycheck.txt.tmpl
@@ -19,7 +19,7 @@
   #%]
 
 [% PROCESS "global/variables.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% addressee %]
 Subject: [[% terms.Bugzilla %]] Sanity Check Results
 X-Bugzilla-Type: sanitycheck
diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl
index a75e03889..74fbc4976 100644
--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -21,7 +21,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 Content-Type: text/plain
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% user.email %]
 Subject: [[% terms.Bugzilla %]] Your account [% user.login -%]
  is being impersonated
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index b249d1964..32d8da8a0 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -19,7 +19,7 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param("mailfrom") %]
 To: [% email %][% Param("emailsuffix") %]
 Subject: Your [% terms.Bugzilla %] [%+ terms.bug %] list needs attention.
 X-Bugzilla-Type: whine
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index ba263fe7d..17ab12431 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -47,7 +47,7 @@
   [% END %]
   [% subject_status = statuses.$action %]
 [% END %]
-From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
 [%- IF attachment %] :
diff --git a/whine.pl b/whine.pl
index a1ff34a1d..e6161cfeb 100755
--- a/whine.pl
+++ b/whine.pl
@@ -97,8 +97,7 @@ my $sth_schedules_by_event = $dbh->prepare(
 
 # Send whines from the address in the 'mailfrom' Parameter so that all
 # Bugzilla-originated mail appears to come from a single address.
-my $fromaddress = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
-                  ' <' . Bugzilla->params->{'mailfrom'} . '>';
+my $fromaddress = Bugzilla->params->{'mailfrom'};
 
 # get the current date and time
 my ($now_sec, $now_minute, $now_hour, $now_day, $now_month, $now_year,