vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Properly encode From: header 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@700 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-04-01 13:53:45 +00:00
parent c197395a87
commit 976e419c3f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Bugzilla/Mailer.pm
View File

@ -130,6 +130,8 @@ sub MessageToMTA {
}
my $from = $email->header('From');
my $from_obj = $from ? [Email::Address->parse($from)]->[0] : undef;
$from_obj and $email->header_set('From', encode('MIME-Header', $from_obj->name) . ' <' . $from_obj->address . '>');
my ($hostname, @args);
if ($method eq "Sendmail") {
@ -138,15 +140,9 @@ sub MessageToMTA {
}
push @args, "-i";
# We want to make sure that we pass *only* an email address.
if ($from) {
my ($email_obj) = Email::Address->parse($from);
if ($email_obj) {
my $from_email = $email_obj->address;
push(@args, "-f$from_email") if $from_email;
}
}
push(@args, "-ODeliveryMode=deferred")
if !Bugzilla->params->{"sendmailnow"};
push @args, "-f" . $from_obj->address if $from_obj;
push @args, "-ODeliveryMode=deferred"
unless Bugzilla->params->{"sendmailnow"};
}
else {
# Sendmail adds a Date: header also, but others may not.