bug #34034 [Mailer][MailchimpBridge] Don't send address names if empty string (ogizanagi)

fabpot · fabpot · commit 2931227cadee · 2019-10-22T17:26:22.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer][MailchimpBridge] Don't send address names if empty string | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | #34029 (comment)  | License | MIT | Doc PR | N/A Commits ------- 197d123 [Mailer][MailchimpBridge] Don't send address names if empty string
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
@@ -75,12 +75,15 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
-                'from_name' => $envelope->getSender()->getName(),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
+        if ('' !== $envelope->getSender()->getName()) {
+            $payload['message']['from_name'] = $envelope->getSender()->getName();
+        }
+
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -122,10 +125,13 @@ protected function getRecipients(Email $email, Envelope $envelope): array
 
             $recipientPayload = [
                 'email' => $recipient->getAddress(),
-                'name' => $recipient->getName(),
                 'type' => $type,
             ];
 
+            if ('' !== $recipient->getName()) {
+                $recipientPayload['name'] = $recipient->getName();
+            }
+
             $recipients[] = $recipientPayload;
         }
 
