bug #35173 [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API (vilius-g)

fabpot · fabpot · commit e3485131574b · 2020-01-02T19:35:45.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Previous code tries to pass attachments to API, but uses incorrect structure and as a result all attachments are missing when the email is sent. This also adds previously missing attachment names. Commits ------- 7b1bbb6 [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php
@@ -79,10 +79,14 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
                 'type' => $headers->get('Content-Type')->getBody(),
             ];
 
+            if ($name = $headers->getHeaderParameter('Content-Disposition', 'name')) {
+                $att['name'] = $name;
+            }
+
             if ('inline' === $disposition) {
-                $payload['images'][] = $att;
+                $payload['message']['images'][] = $att;
             } else {
-                $payload['attachments'][] = $att;
+                $payload['message']['attachments'][] = $att;
             }
         }
 
