bug #39980 [Mailer][Mime] Update inline part names with newly generated ContentId (ddegentesh)

fabpot · fabpot · commit 2d2653042a38 · 2021-02-05T09:16:59.000+01:00
This PR was submitted for the 5.2 branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- [Mailer][Mime] Update inline part names with newly generated ContentId Inline parts are identified by matching attachment names to cids found in the html part. In line 487 cids are regenerated and replaced in the html part, but the attachment names were not similarly replaced. | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Commits ------- eb14a1e [Mailer][Mime] Update inline part names with newly generated ContentId
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -491,6 +491,7 @@ private function prepareParts(): ?array
                 $attachment['inline'] = true;
                 $inlineParts[$name] = $part = $this->createDataPart($attachment);
                 $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);
+                $part->setName($part->getContentId());
                 continue 2;
             }
             $attachmentParts[] = $this->createDataPart($attachment);

Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,7 @@ private function prepareParts(): ?array`
`491`	`491`	`$attachment['inline'] = true;`
`492`	`492`	`$inlineParts[$name] = $part = $this->createDataPart($attachment);`
`493`	`493`	`$html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);`
	`494`	`+ $part->setName($part->getContentId());`
`494`	`495`	`continue 2;`
`495`	`496`	`}`
`496`	`497`	`$attachmentParts[] = $this->createDataPart($attachment);`