Fix: multi-line embedded image replacement in mail views (#56828)

iammursal · web-flow · commit 2b7936883c18 · 2025-08-29T12:02:26.000-05:00
diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php
@@ -267,7 +267,7 @@ public function render($view, array $data = [])
      */
     protected function replaceEmbeddedAttachments(string $renderedView, array $attachments)
     {
-        if (preg_match_all('/<img.+?src=[\'"]cid:([^\'"]+)[\'"].*?>/i', $renderedView, $matches)) {
+        if (preg_match_all('/<img.+?src=[\'"]cid:([^\'"]+)[\'"].*?>/is', $renderedView, $matches)) {
             foreach (array_unique($matches[1]) as $image) {
                 foreach ($attachments as $attachment) {
                     if ($attachment->getFilename() === $image) {
diff --git a/tests/Integration/Mail/Fixtures/embed-multiline.blade.php b/tests/Integration/Mail/Fixtures/embed-multiline.blade.php
@@ -0,0 +1,4 @@
+Embed multiline content: <img
+    src="{{ $message->embedData('foo', 'foo.jpg', 'image/png') }}"
+    alt="multiline image"
+>
diff --git a/tests/Integration/Mail/SendingMarkdownMailTest.php b/tests/Integration/Mail/SendingMarkdownMailTest.php
@@ -79,6 +79,18 @@ public function testEmbedData()
         EOT, $email);
     }
 
+    public function testEmbedMultilineImage()
+    {
+        Mail::to('test@mail.com')->send($mailable = new EmbedMultilineMailable());
+
+        $html = html_entity_decode($mailable->render());
+
+        $this->assertStringContainsString('Embed multiline content: <img', $html);
+        $this->assertStringContainsString('alt="multiline image"', $html);
+        $this->assertStringContainsString('data:image/png;base64', $html);
+        $this->assertStringNotContainsString('cid:foo.jpg', $html);
+    }
+
     public function testMessageAsPublicPropertyMayBeDefinedAsViewData()
     {
         Mail::to('test@mail.com')->send($mailable = new MessageAsPublicPropertyMailable());
@@ -190,6 +202,23 @@ public function content()
     }
 }
 
+class EmbedMultilineMailable extends Mailable
+{
+    public function envelope()
+    {
+        return new Envelope(
+            subject: 'My basic title',
+        );
+    }
+
+    public function content()
+    {
+        return new Content(
+            markdown: 'embed-multiline',
+        );
+    }
+}
+
 class EmbedDataMailable extends Mailable
 {
     public function envelope()

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public function render($view, array $data = [])`
`267`	`267`	`*/`
`268`	`268`	`protected function replaceEmbeddedAttachments(string $renderedView, array $attachments)`
`269`	`269`	`{`
`270`		`- if (preg_match_all('/<img.+?src=[\'"]cid:([^\'"]+)[\'"].*?>/i', $renderedView, $matches)) {`
	`270`	`+ if (preg_match_all('/<img.+?src=[\'"]cid:([^\'"]+)[\'"].*?>/is', $renderedView, $matches)) {`
`271`	`271`	`foreach (array_unique($matches[1]) as $image) {`
`272`	`272`	`foreach ($attachments as $attachment) {`
`273`	`273`	`if ($attachment->getFilename() === $image) {`