File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
lib/internal/Magento/Framework/Mail Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ public function __construct(
88
88
if ($ replyTo ) {
89
89
$ this ->message ->setReplyTo ($ this ->convertAddressArrayToAddressList ($ replyTo ));
90
90
}
91
- if ($ replyTo ) {
91
+ if ($ from ) {
92
92
$ this ->message ->setFrom ($ this ->convertAddressArrayToAddressList ($ from ));
93
93
}
94
94
if ($ cc ) {
Original file line number Diff line number Diff line change 15
15
*/
16
16
class MimePart implements MimePartInterface
17
17
{
18
+ public const CHARSET_UTF8 = 'utf-8 ' ;
19
+
18
20
/**
19
21
* @var ZendMimePart
20
22
*/
@@ -43,13 +45,13 @@ class MimePart implements MimePartInterface
43
45
*/
44
46
public function __construct (
45
47
$ content ,
46
- ?string $ type = MimeInterface::TYPE_OCTET_STREAM ,
48
+ ?string $ type = MimeInterface::TYPE_HTML ,
47
49
?string $ fileName = null ,
48
- ?string $ disposition = null ,
49
- ?string $ encoding = MimeInterface::ENCODING_8BIT ,
50
+ ?string $ disposition = MimeInterface:: DISPOSITION_INLINE ,
51
+ ?string $ encoding = MimeInterface::ENCODING_UTF8 ,
50
52
?string $ description = null ,
51
53
?array $ filters = [],
52
- ?string $ charset = null ,
54
+ ?string $ charset = self :: CHARSET_UTF8 ,
53
55
?string $ boundary = null ,
54
56
?string $ location = null ,
55
57
?string $ language = null ,
You can’t perform that action at this time.
0 commit comments