fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix inconsistent assignment of sender address in member emails

Browse source
This commit is contained in:
Kijin Sung 2017-06-29 17:26:07 +09:00
parent 986f532ba5
commit 0920172c1e
2 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/advanced_mailer/advanced_mailer.controller.php
View file

@ -27,7 +27,11 @@ class Advanced_MailerController extends Advanced_Mailer
if (!$mail->getFrom())
{
$mail->setFrom($config->sender_email, $config->sender_name ?: null);
$mail->setFrom(config('mail.default_from'), config('mail.default_name'));
if ($replyTo = config('mail.default_reply_to'))
{
$mail->setReplyTo($replyTo);
}
}
elseif (toBool($config->force_sender))
{
@ -39,9 +43,9 @@ class Advanced_MailerController extends Advanced_Mailer
{
$original_sender_email = array_first_key($mail->message->getFrom());
$original_sender_name = array_first($mail->message->getFrom());
if ($original_sender_email !== $config->sender_email)
if ($original_sender_email !== config('mail.default_from'))
{
$mail->setFrom($config->sender_email, $original_sender_name ?: $config->sender_name);
$mail->setFrom(config('mail.default_from'), $original_sender_name ?: config('mail.default_name'));
$mail->setReplyTo($original_sender_email);
}
}