ソースを参照

Fixed attachment name encoding

Will Browning 5 年 前
コミット
f92f5d76d5
3 ファイル変更6 行追加6 行削除
  1. 2 2
      app/EmailData.php
  2. 2 2
      app/Mail/ForwardEmail.php
  3. 2 2
      app/Mail/ReplyToEmail.php

+ 2 - 2
app/EmailData.php

@@ -21,8 +21,8 @@ class EmailData
         foreach ($parser->getAttachments() as $attachment) {
             $this->attachments[] = [
               'stream' => base64_encode(stream_get_contents($attachment->getStream())),
-              'file_name' => $attachment->getFileName(),
-              'mime' => $attachment->getContentType()
+              'file_name' => base64_encode($attachment->getFileName()),
+              'mime' => base64_encode($attachment->getContentType())
           ];
         }
     }

+ 2 - 2
app/Mail/ForwardEmail.php

@@ -100,8 +100,8 @@ class ForwardEmail extends Mailable implements ShouldQueue
         foreach ($this->emailAttachments as $attachment) {
             $email->attachData(
                 base64_decode($attachment['stream']),
-                $attachment['file_name'],
-                ['mime' => $attachment['mime']]
+                base64_decode($attachment['file_name']),
+                ['mime' => base64_decode($attachment['mime'])]
             );
         }
 

+ 2 - 2
app/Mail/ReplyToEmail.php

@@ -71,8 +71,8 @@ class ReplyToEmail extends Mailable implements ShouldQueue
         foreach ($this->emailAttachments as $attachment) {
             $email->attachData(
                 base64_decode($attachment['stream']),
-                $attachment['file_name'],
-                ['mime' => $attachment['mime']]
+                base64_decode($attachment['file_name']),
+                ['mime' => base64_decode($attachment['mime'])]
             );
         }