Skip to content

Commit bdb0533

Browse files
committed
Fix sender and reply-to mail headers and add support for Magento 2.4.8-p3
1 parent 16cda02 commit bdb0533

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Mail/Smtp.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ protected function setSender($message)
150150

151151
if ($setFromEmail !== null && $dataHelper->getConfigSetFrom()) {
152152
if ($setFromEmail instanceof Address) {
153-
$message->getHeaders()->addMailboxListHeader('Sender', [$setFromEmail]);
153+
$message->getHeaders()->addMailboxHeader('Sender', $setFromEmail);
154154
} elseif (!empty($setFromEmail)) {
155155
$name = $messageFromAddress instanceof Address ? $messageFromAddress->getName() : $setFromEmail;
156156

157-
$message->getHeaders()->addMailboxListHeader(
157+
$message->getHeaders()->addMailboxHeader(
158158
'Sender',
159-
[new Address($setFromEmail, $name)]
159+
new Address($setFromEmail, $name)
160160
);
161161
}
162162
}
@@ -189,13 +189,13 @@ protected function setReplyToPath($message)
189189

190190
if (empty($message->getHeaders()->get('reply-to')?->getAddresses()) && $dataHelper->getConfigSetReplyTo()) {
191191
if ($returnPathEmail instanceof Address) {
192-
$message->getHeaders()->addMailboxListHeader('reply-to', [$returnPathEmail]);
192+
$message->getHeaders()->addMailboxHeader('reply-to', $returnPathEmail);
193193
} elseif (!empty($returnPathEmail)) {
194194
$name = $messageFromAddress instanceof Address ? $messageFromAddress->getName() : $returnPathEmail;
195195

196-
$message->getHeaders()->addMailboxListHeader(
196+
$message->getHeaders()->addMailboxHeader(
197197
'reply-to',
198-
[new Address($returnPathEmail, $name)]
198+
new Address($returnPathEmail, $name)
199199
);
200200
}
201201
}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"php": "~8.2.0||~8.3.0||~8.4.0",
2020
"magento/module-backend": "102.0.*",
2121
"magento/framework": "103.0.*",
22-
"magento/module-email": "101.1.8||101.1.8-p1||101.1.8-p2",
22+
"magento/module-email": "101.1.8||101.1.8-p1||101.1.8-p2||101.1.8-p3",
2323
"magepal/magento2-core":">1.1.0"
2424
},
2525
"type": "magento2-module",
26-
"version": "3.0.2",
26+
"version": "3.0.3",
2727
"license": [
2828
"proprietary"
2929
],

0 commit comments

Comments
 (0)