From 1afa91fb5e69c07a0b63a6ce008839e17172819f Mon Sep 17 00:00:00 2001 From: weifeng Date: Fri, 14 May 2021 14:37:34 +0800 Subject: [PATCH] refactor(transport): Modify default value of the mail from --- src/DirectMailTransport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DirectMailTransport.php b/src/DirectMailTransport.php index f1f151a..03c1227 100644 --- a/src/DirectMailTransport.php +++ b/src/DirectMailTransport.php @@ -116,11 +116,11 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul protected function payload(Swift_Mime_SimpleMessage $message, array $region) { $parameters = array_filter([ - 'AccountName' => Arr::get($this->options, 'from_address', \config('mail.from.address', key($message->getFrom()))), + 'AccountName' => Arr::get($this->options, 'from_address', key($message->getFrom())), 'ReplyToAddress' => 'true', 'AddressType' => Arr::get($this->options, 'address_type', 1), 'ToAddress' => $this->getTo($message), - 'FromAlias' => Arr::get($this->options, 'from_alias'), + 'FromAlias' => Arr::get($this->options, 'from_alias', current($message->getFrom())), 'Subject' => $message->getSubject(), 'ClickTrace' => Arr::get($this->options, 'click_trace', 0), 'Format' => 'json',