fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 17:44:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2115 only set default Reply-To address if the user has not specified a Reply-To address

Browse source
This commit is contained in:
Kijin Sung 2023-05-21 20:00:30 +09:00
parent 51a910a310
commit baf80a0d80
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,9 +33,10 @@ class Advanced_MailerController extends Advanced_Mailer
{ {
list($default_from, $default_name) = $this->getDefaultEmailIdentity(); list($default_from, $default_name) = $this->getDefaultEmailIdentity();
$mail->setFrom($default_from, $default_name); $mail->setFrom($default_from, $default_name);
if ($replyTo = config('mail.default_reply_to')) $default_reply_to = config('mail.default_reply_to');
if ($default_reply_to && !$mail->message->getReplyTo())
{ {
$mail->setReplyTo($replyTo); $mail->setReplyTo($default_reply_to);
} }
} }
elseif (toBool($config->force_sender ?? 'N')) elseif (toBool($config->force_sender ?? 'N'))