Fix embedding files

laravel · Jubeki · Sep 8, 2021 · Sep 8, 2021 · Sep 10, 2021 · Sep 10, 2021
commit d1c244a856a5614c00f7bee289878b9e50b5366a
diff --git a/src/Illuminate/Mail/Message.php b/src/Illuminate/Mail/Message.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Mail;
 
+use Illuminate\Support\Str;
 use Illuminate\Support\Traits\ForwardsCalls;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
@@ -243,20 +244,22 @@ public function attachData($data, $name, array $options = [])
     }
 
     /**
-     * Embed a file in the message.
+     * Embed a file in the message and get the CID.
      *
      * @param  string  $file
-     * @return $this
+     * @return string
      */
     public function embed($file)
     {
-        $this->message->embedFromPath($file);
+        $cid = Str::random(10);
 
-        return $this;
+        $this->message->embedFromPath($file, $cid);
+
+        return "cid:$cid";
     }
 
     /**
-     * Embed in-memory data in the message.
+     * Embed in-memory data in the message and get the CID.
      *
      * @param  string  $data
      * @param  string  $name
@@ -267,7 +270,7 @@ public function embedData($data, $name, $contentType = null)
     {
         $this->message->embed($data, $name, $contentType);
 
-        return $this;
+        return "cid:$name";
     }
 
     /**