Include _appCharset in serialisation process

cakephp · Oct 14, 2015 · a786e95 · a786e95
1 parent 22f960b
commit a786e95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Mailer/Email.php b/src/Mailer/Email.php
@@ -1906,7 +1906,7 @@ public function jsonSerialize()
         $properties = [
             '_to', '_from', '_sender', '_replyTo', '_cc', '_bcc', '_subject',
             '_returnPath', '_readReceipt', '_emailFormat', '_emailPattern', '_domain',
-            '_attachments', '_messageId', '_headers', 'viewVars', 'charset', 'headerCharset'
+            '_attachments', '_messageId', '_headers', '_appCharset', 'viewVars', 'charset', 'headerCharset'
         ];
 
         $array = ['viewConfig' => $this->viewBuilder()->jsonSerialize()];

diff --git a/tests/TestCase/Mailer/EmailTest.php b/tests/TestCase/Mailer/EmailTest.php
@@ -2701,6 +2701,7 @@ public function testJsonSerialize()
             '_emailFormat' => 'text',
             '_messageId' => '<uuid@server.com>',
             '_domain' => 'foo.bar',
+            '_appCharset' => 'UTF-8',
             'charset' => 'utf-8',
             'headerCharset' => 'utf-8',
             'viewConfig' => [