Skip to content

Commit

Permalink
enclosing sender name with double quotes (#10326)
Browse files Browse the repository at this point in the history
Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com>
Co-authored-by: Norman Pracht - Webmecanik <npr@webmecanik.com>
Co-authored-by: Dennis Ameling (he/him) <dennis@dennisameling.com>
  • Loading branch information
4 people committed Nov 10, 2021
1 parent 8f3c58b commit 7b85da4
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -337,7 +337,7 @@ public function getAmazonMessage(\Swift_Mime_SimpleMessage $message)
$fromEmail = current(array_keys($from));
$fromName = $from[$fromEmail];

$sesArray['FromEmailAddress'] = (!empty($fromName)) ? mb_encode_mimeheader($fromName).' <'.$fromEmail.'>' : $fromEmail;
$sesArray['FromEmailAddress'] = (!empty($fromName)) ? '"'.mb_encode_mimeheader($fromName).'" <'.$fromEmail.'>' : $fromEmail;
$to = $message->getTo();
if (!empty($to)) {
$sesArray['Destination']['ToAddresses'] = array_keys($to);
Expand Down Expand Up @@ -380,7 +380,7 @@ public function getAmazonMessage(\Swift_Mime_SimpleMessage $message)
$toSendMessage = (new \Swift_Message());
$toSendMessage->setSubject($tokenizedMessage['subject']);
$toSendMessage->setFrom([$tokenizedMessage['from']['email'] => $tokenizedMessage['from']['name']]);
$sesArray['FromEmailAddress'] = (!empty($tokenizedMessage['from']['name'])) ? mb_encode_mimeheader($tokenizedMessage['from']['name']).' <'.$tokenizedMessage['from']['email'].'>' : $tokenizedMessage['from']['email'];
$sesArray['FromEmailAddress'] = (!empty($tokenizedMessage['from']['name'])) ? '"'.mb_encode_mimeheader($tokenizedMessage['from']['name']).'" <'.$tokenizedMessage['from']['email'].'>' : $tokenizedMessage['from']['email'];
$toSendMessage->setTo([$recipient]);
$sesArray['Destination']['ToAddresses'] = [$recipient];
if (isset($tokenizedMessage['text']) && strlen($tokenizedMessage['text']) > 0) {
Expand Down

0 comments on commit 7b85da4

Please sign in to comment.