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

Fix 64537818f6

Browse source
This commit is contained in:
conory 2023-12-08 23:40:56 +09:00
parent 64537818f6
commit 78e339fc9c
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/framework/Mail.php
View file

@ -581,11 +581,6 @@ class Mail
$id = $random . '@' . (preg_match('/^(.+)@([^@]+)$/', $sender_email, $matches) ? $matches[2] : 'swift.generated'); $id = $random . '@' . (preg_match('/^(.+)@([^@]+)$/', $sender_email, $matches) ? $matches[2] : 'swift.generated');
$this->message->getHeaders()->get('Message-ID')->setId($id); $this->message->getHeaders()->get('Message-ID')->setId($id);
if (config('mail.default_force') && config('mail.default_from'))
{
$this->setFrom(config('mail.default_from'), config('mail.default_name') ?: null);
}
try try
{ {
$this->sent = $this->driver->send($this) ? true : false; $this->sent = $this->driver->send($this) ? true : false;

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

@ -39,7 +39,7 @@ class Advanced_MailerController extends Advanced_Mailer
$mail->setReplyTo($default_reply_to); $mail->setReplyTo($default_reply_to);
} }
} }
elseif (toBool($config->force_sender ?? 'N')) elseif (toBool($config->force_sender ?? 'N') || config('mail.default_force'))
{ {
if (stripos($mail->driver->getName(), 'woorimail') !== false && config('mail.woorimail.api_type') === 'free') if (stripos($mail->driver->getName(), 'woorimail') !== false && config('mail.woorimail.api_type') === 'free')
{ {