diff options
| author | yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664> | 2017-10-17 21:04:37 +0000 |
|---|---|---|
| committer | yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664> | 2017-10-17 21:04:37 +0000 |
| commit | a55cff0dfacfb27a80e763b009b47daea9b61f12 (patch) | |
| tree | c2c4286b1d7c2f96748e47b288a9f40762a2a724 /Postman/Postman-Mail | |
| parent | 0e5055bf5b513df03b0f9ac8bd2810ffe72ed744 (diff) | |
| download | Post-SMTP-a55cff0dfacfb27a80e763b009b47daea9b61f12.zip | |
= 1.7.7 - 2017-10-17
* Fixed: Error sending files with sendgrid
* Fixed: Wrong attachments format in Mandrill
* Fixed: Wrong Sender Header in Mandrill
Diffstat (limited to 'Postman/Postman-Mail')
| -rw-r--r-- | Postman/Postman-Mail/PostmanMandrillMailEngine.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Postman/Postman-Mail/PostmanMandrillMailEngine.php b/Postman/Postman-Mail/PostmanMandrillMailEngine.php index bd26e07..7549a37 100644 --- a/Postman/Postman-Mail/PostmanMandrillMailEngine.php +++ b/Postman/Postman-Mail/PostmanMandrillMailEngine.php @@ -69,7 +69,7 @@ if ( ! class_exists( 'PostmanMandrillMailEngine' ) ) { // add the From Header $sender = $message->getFromAddress(); { - $senderEmail = $sender->getEmail(); + $senderEmail = PostmanOptions::getInstance()->getMessageSenderEmail(); $senderName = $sender->getName(); assert( ! empty( $senderEmail ) ); $this->mandrillMessage ['from_email'] = $senderEmail; @@ -217,7 +217,7 @@ if ( ! class_exists( 'PostmanMandrillMailEngine' ) ) { $attachment = array( 'type' => 'attachment', 'name' => basename( $file ), - 'content' => file_get_contents( $file ), + 'content' => base64_encode( file_get_contents( $file ) ), ); array_push( $this->mandrillMessage ['attachments'], $attachment ); } |