Skip to content

Commit 6976aab

Browse files
committed
MC-21868: Magento 2.3.3 notifications converted to attachments in MS Exchange - Disposition Header
1 parent e62c675 commit 6976aab

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/internal/Magento/Framework/Mail/Message.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ private function createMimeFromString($body, $messageType)
171171
$part = new Part($body);
172172
$part->setCharset($this->zendMessage->getEncoding());
173173
$part->setEncoding(Mime::ENCODING_QUOTEDPRINTABLE);
174-
$part->setDisposition(Mime::DISPOSITION_INLINE);
175174
$part->setType($messageType);
176175
$mimeMessage = new \Zend\Mime\Message();
177176
$mimeMessage->addPart($part);

lib/internal/Magento/Framework/Mail/MimePart.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
class MimePart implements MimePartInterface
1717
{
18+
/**
19+
* UTF-8 charset
20+
*/
1821
public const CHARSET_UTF8 = 'utf-8';
1922

2023
/**
@@ -47,7 +50,7 @@ public function __construct(
4750
$content,
4851
?string $type = MimeInterface::TYPE_HTML,
4952
?string $fileName = null,
50-
?string $disposition = MimeInterface::DISPOSITION_INLINE,
53+
?string $disposition = null,
5154
?string $encoding = MimeInterface::ENCODING_QUOTED_PRINTABLE,
5255
?string $description = null,
5356
?array $filters = [],

lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public function testSetBodyHtml()
2929
$this->assertEquals('quoted-printable', $part->getEncoding());
3030
$this->assertEquals('utf-8', $part->getCharset());
3131
$this->assertEquals('body', $part->getContent());
32-
$this->assertEquals('inline', $part->getDisposition());
3332
}
3433

3534
public function testSetBodyText()
@@ -41,6 +40,5 @@ public function testSetBodyText()
4140
$this->assertEquals('quoted-printable', $part->getEncoding());
4241
$this->assertEquals('utf-8', $part->getCharset());
4342
$this->assertEquals('body', $part->getContent());
44-
$this->assertEquals('inline', $part->getDisposition());
4543
}
4644
}

0 commit comments

Comments
 (0)