#13787 issue -- and general core repair

This commit is contained in:
david nicol 2012-02-23 17:27:14 -06:00 committed by Colin Kuskie
parent 3b544ee4fb
commit ff28ef9dc1

View file

@ -343,7 +343,14 @@ sub create {
}
}
}
my $from = $headers->{from} || $session->setting->get('companyName') . " <".$session->setting->get("companyEmail").">";
my $from = $headers->{from};
$from ||= do {
my $CoNa = $session->setting->get('companyName');
my $CoEm = $session->setting->get("companyEmail");
$CoNa =~ s/"//g;
qq{"$CoNa" <$CoEm>}
};
my $type = $headers->{contentType} || "multipart/mixed";
my $replyTo = $headers->{replyTo} || $session->setting->get("mailReturnPath");