From 1af952ceaa1c06a10e0eeb6f139e5a5652002e98 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@redhat.com>
Date: Thu, 29 May 2014 14:18:24 +0000
Subject: Bug 1016273: Bugzilla whine emails missing change to From header made
 by bug 1010751

---
 email_in.pl  | 3 ++-
 importxml.pl | 3 ++-
 whine.pl     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/email_in.pl b/email_in.pl
index 34e57c90c..928758a9e 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -387,7 +387,8 @@ sub die_handler {
        $msg =~ s/at .+ line.*$//ms;
        $msg =~ s/^Compilation failed in require.+$//ms;
        $msg = html_strip($msg);
-       my $from = Bugzilla->params->{'mailfrom'};
+       my $from = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
+                  ' <' . Bugzilla->params->{'mailfrom'} . '>';
        my $reply = reply(to => $input_email, from => $from, top_post => 1, 
                          body => "$msg\n");
        MessageToMTA($reply->as_string);
diff --git a/importxml.pl b/importxml.pl
index 19be9a61a..e4eeb014f 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -133,7 +133,8 @@ sub MailMessage {
     my $subject    = shift;
     my $message    = shift;
     my @recipients = @_;
-    my $from   = $params->{"mailfrom"};
+    my $from = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
+               ' <' . Bugzilla->params->{'mailfrom'} . '>';
     $from =~ s/@/\@/g;
 
     foreach my $to (@recipients){
diff --git a/whine.pl b/whine.pl
index e6161cfeb..a1ff34a1d 100755
--- a/whine.pl
+++ b/whine.pl
@@ -97,7 +97,8 @@ 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 = Bugzilla->params->{'mailfrom'};
+my $fromaddress = '"' . template_var('terms')->{'BugzillaTitle'} . '"' .
+                  ' <' . Bugzilla->params->{'mailfrom'} . '>';
 
 # get the current date and time
 my ($now_sec, $now_minute, $now_hour, $now_day, $now_month, $now_year, 
-- 
cgit v1.2.3-24-g4f1b