Skip to content
Permalink
Browse files

Fix coding standards.

  • Loading branch information...
markstory committed May 22, 2012
1 parent f816f6a commit 0ed675211007031dfc6a6368680e066b23e2c1c2
Showing with 10 additions and 6 deletions.
  1. +10 −5 lib/Cake/Network/Email/CakeEmail.php
  2. +0 −1 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -307,12 +307,13 @@ class CakeEmail {
protected $_charset8bit = array('UTF-8', 'SHIFT_JIS');
/**
* define Content-Type charset name
* Define Content-Type charset name
*
* @var array
*/
protected $_contentTypeCharset = array('ISO-2022-JP-MS' => 'ISO-2022-JP');
protected $_contentTypeCharset = array(
'ISO-2022-JP-MS' => 'ISO-2022-JP'
);
/**
* Constructor
@@ -1568,7 +1569,10 @@ protected function _getContentTransferEncoding() {
}
/**
* Return charset value for Content-Type
* Return charset value for Content-Type.
*
* Checks fallback/compatibility types which include workarounds
* for legacy japanese character sets.
*
* @return string
*/
@@ -1580,4 +1584,5 @@ protected function _getContentTypeCharset() {
return strtoupper($this->charset);
}
}
}
}
@@ -1591,7 +1591,6 @@ public function testBodyEncodingIso2022JpMs() {
$this->assertContains(mb_convert_encoding('①㈱','ISO-2022-JP-MS'), $result['message']);
}
protected function _checkContentTransferEncoding($message, $charset) {
$boundary = '--alt-' . $this->CakeEmail->getBoundary();
$result['text'] = false;

0 comments on commit 0ed6752

Please sign in to comment.
You can’t perform that action at this time.