Skip to content

Commit e442de5

Browse files
authored
Merge pull request #1515 from magento-thunder/MAGETWO-72477-2
Fixed issue: MAGETWO-72477: Bogus emails generated when the recipient name contains special characters
2 parents 96f9822 + 0f6795d commit e442de5

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Framework\Mail;
7+
8+
class MessageTest extends \PHPUnit\Framework\TestCase
9+
{
10+
/**
11+
* @var Message
12+
*/
13+
private $message;
14+
15+
/**
16+
* @inheritdoc
17+
*/
18+
protected function setUp()
19+
{
20+
$this->message = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
21+
->create(Message::class);
22+
}
23+
24+
public function testGetHeaderEncodingDefaultValue()
25+
{
26+
$this->assertEquals(\Zend_Mime::ENCODING_BASE64, $this->message->getHeaderEncoding());
27+
}
28+
29+
public function testGetCharsetDefaultValue()
30+
{
31+
$this->assertEquals('utf-8', $this->message->getCharset());
32+
}
33+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Message extends \Zend_Mail implements MessageInterface
1515
public function __construct($charset = 'utf-8')
1616
{
1717
parent::__construct($charset);
18+
$this->setHeaderEncoding(\Zend_Mime::ENCODING_BASE64);
1819
}
1920

2021
/**

0 commit comments

Comments
 (0)