Skip to content

Commit 2b77950

Browse files
committed
MC-15295: Fix integration tests
1 parent 837d0db commit 2b77950

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,16 @@ protected function prepareMessage()
416416
*/
417417
private function addAddressByType(string $addressType, $email, ?string $name = null): void
418418
{
419-
if (is_array($email)) {
419+
if (is_string($email)) {
420+
$this->messageData[$addressType][] = $this->addressConverter->convert($email, $name);
421+
return;
422+
}
423+
$convertedAddressArray = $this->addressConverter->convertMany($email);
424+
if (isset($this->messageData[$addressType])) {
420425
$this->messageData[$addressType] = array_merge(
421426
$this->messageData[$addressType],
422-
$this->addressConverter->convertMany($email)
427+
$convertedAddressArray
423428
);
424-
425-
return;
426429
}
427-
$this->messageData[$addressType][] = $this->addressConverter->convert($email, $name);
428430
}
429431
}

0 commit comments

Comments
 (0)