Skip to content

Commit 29822c1

Browse files
TomashKhamlaicod43156
authored andcommitted
Update \Magento\Email\Model\Transport::setReturnPath to use the existing logic defined in [Headers.php v6.4.19](https://github.com/symfony/mime/blob/v6.4.19/Header/Headers.php)
1 parent 97b2ea4 commit 29822c1

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

app/code/Magento/Email/Model/Transport.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,15 @@ public function sendMessage(): void
242242
private function setReturnPath(SymfonyMessage $email): void
243243
{
244244
if ($this->isSetReturnPath === 2 && $this->returnPathValue) {
245-
$email->getHeaders()->addMailboxListHeader('Sender', [$this->returnPathValue]);
245+
$email->getHeaders()->addMailboxHeader('Sender', $this->returnPathValue);
246246
} elseif ($this->isSetReturnPath === 1 &&
247-
!empty($fromAddresses = $email->getHeaders()->get('From')?->getAddresses())) {
247+
!empty(
248+
/** @var \Symfony\Component\Mime\Address[] $fromAddresses */
249+
$fromAddresses = $email->getHeaders()->get('From')?->getAddresses()
250+
)
251+
) {
248252
reset($fromAddresses);
249-
$email->getHeaders()->addMailboxListHeader('Sender', [current($fromAddresses)->getAddress()]);
253+
$email->getHeaders()->addMailboxHeader('Sender', current($fromAddresses));
250254
}
251255
}
252256

0 commit comments

Comments
 (0)