Skip to content

Commit 43fb1f1

Browse files
committed
Revert "MC-21868: Magento 2.3.3 notifications converted to attachments in MS Exchange - Disposition Header"
This reverts commit 6976aab.
1 parent 9a68d68 commit 43fb1f1

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ 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);
174175
$part->setType($messageType);
175176
$mimeMessage = new \Laminas\Mime\Message();
176177
$mimeMessage->addPart($part);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
$content,
5151
?string $type = MimeInterface::TYPE_HTML,
5252
?string $fileName = null,
53-
?string $disposition = null,
53+
?string $disposition = MimeInterface::DISPOSITION_INLINE,
5454
?string $encoding = MimeInterface::ENCODING_QUOTED_PRINTABLE,
5555
?string $description = null,
5656
?array $filters = [],

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public function testSetBodyHtml()
3434
$this->assertEquals('quoted-printable', $part->getEncoding());
3535
$this->assertEquals('utf-8', $part->getCharset());
3636
$this->assertEquals('body', $part->getContent());
37+
$this->assertEquals('inline', $part->getDisposition());
3738
}
3839

3940
public function testSetBodyText()
@@ -45,5 +46,6 @@ public function testSetBodyText()
4546
$this->assertEquals('quoted-printable', $part->getEncoding());
4647
$this->assertEquals('utf-8', $part->getCharset());
4748
$this->assertEquals('body', $part->getContent());
49+
$this->assertEquals('inline', $part->getDisposition());
4850
}
4951
}

0 commit comments

Comments
 (0)