php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

SwiftMailer message updated to setup charset for alternative body correctly.

Browse Source
This commit is contained in:
Paul Klimov
2014-01-08 13:45:48 +02:00
parent dc01411bea
commit 232a223c17
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/yii/swiftmailer/Message.php
View File

@ -188,6 +188,7 @@ class Message extends BaseMessage
{
$message = $this->getSwiftMessage();
$oldBody = $message->getBody();
$charset = $message->getCharset();
if (empty($oldBody)) {
$parts = $message->getChildren();
$partFound = false;
@ -195,6 +196,7 @@ class Message extends BaseMessage
if (!($part instanceof \Swift_Mime_Attachment)) {
/* @var \Swift_Mime_MimePart $part */
if ($part->getContentType() == $contentType) {
$charset = $part->getCharset();
unset($parts[$key]);
$partFound = true;
break;
@ -204,7 +206,7 @@ class Message extends BaseMessage
if ($partFound) {
reset($parts);
$message->setChildren($parts);
$message->addPart($body, $contentType);
$message->addPart($body, $contentType, $charset);
} else {
$message->setBody($body, $contentType);
}
@ -215,8 +217,8 @@ class Message extends BaseMessage
} else {
$message->setBody(null);
$message->setContentType(null);
$message->addPart($oldBody, $oldContentType);
$message->addPart($body, $contentType);
$message->addPart($oldBody, $oldContentType, $charset);
$message->addPart($body, $contentType, $charset);
}
}
}

19
tests/unit/extensions/swiftmailer/MessageTest.php
View File

@ -341,4 +341,23 @@ class MessageTest extends VendorTestCase
$unserializedMessaage = unserialize($serializedMessage);
$this->assertEquals($message, $unserializedMessaage, 'Unable to unserialize message!');
}
/**
* @depends testSendAlternativeBody
*/
public function testAlternativeBodyCharset()
{
$message = $this->createTestMessage();
$charset = 'windows-1251';
$message->setCharset($charset);
$message->setTextBody('some text');
$message->setHtmlBody('some html');
$content = $message->toString();
$this->assertEquals(2, substr_count($content, $charset), 'Wrong charset for alternative body.');
$message->setTextBody('some text override');
$content = $message->toString();
$this->assertEquals(2, substr_count($content, $charset), 'Wrong charset for alternative body override.');
}
}