Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit 989f19e71151 · 2025-11-12T17:21:49.000+01:00
* 6.4:
  [Mime] Remove unused  variable in Email::prepareParts
diff --git a/Email.php b/Email.php
@@ -492,7 +492,7 @@ private function prepareParts(): ?array
                 }
 
                 if ($name !== $part->getContentId()) {
-                    $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html, $count);
+                    $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);
                 }
                 $relatedParts[$name] = $part;
                 $part->setName($part->getContentId())->asInline();

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ private function prepareParts(): ?array`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`if ($name !== $part->getContentId()) {`
`495`		`- $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html, $count);`
	`495`	`+ $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);`
`496`	`496`	`}`
`497`	`497`	`$relatedParts[$name] = $part;`
`498`	`498`	`$part->setName($part->getContentId())->asInline();`