adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

The assembly of the message was not correctly completed in specific Japanese.

Browse source
This commit is contained in:
TAKAHASHI Kunihiko 2013-05-17 18:36:53 +09:00
parent de7535d5a1
commit a562d9c04e
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1253,7 +1253,7 @@ class CakeEmail {
$formatted[] = ''; $formatted[] = '';
continue; continue;
} }
if (!preg_match('/\<[a-z]/i', $line)) { if (!preg_match('/<[a-z]+.+>/i', $line)) {
$formatted = array_merge( $formatted = array_merge(
$formatted, $formatted,
explode("\n", wordwrap($line, $wrapLength, "\n")) explode("\n", wordwrap($line, $wrapLength, "\n"))

32
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -1622,6 +1622,38 @@ class CakeEmailTest extends CakeTestCase {
$this->assertContains('ってテーブルを作ってやってたらう', $result['message']); $this->assertContains('ってテーブルを作ってやってたらう', $result['message']);
} }
public function testWrapLongLine() {
$message = '<a href="http://cakephp.org">' . str_repeat('1234567890', 100) . "</a>";
$this->CakeEmail->reset();
$this->CakeEmail->transport('Debug');
$this->CakeEmail->from('cake@cakephp.org');
$this->CakeEmail->to('cake@cakephp.org');
$this->CakeEmail->subject('Wordwrap Test');
$this->CakeEmail->config(array('empty'));
$result = $this->CakeEmail->send($message);
$expected = "<a\r\n" . 'href="http://cakephp.org">' . str_repeat('1234567890', 100) . "\r\n</a>\r\n\r\n";
$this->assertEquals($expected, $result['message']);
}
public function testWrapForJapaneseEncoding() {
$this->skipIf(!function_exists('mb_convert_encoding'));
$message = mb_convert_encoding('受け付けました', 'iso-2022-jp', 'UTF-8');
$this->CakeEmail->reset();
$this->CakeEmail->transport('Debug');
$this->CakeEmail->from('cake@cakephp.org');
$this->CakeEmail->to('cake@cakephp.org');
$this->CakeEmail->subject('Wordwrap Test');
$this->CakeEmail->config(array('empty'));
$this->CakeEmail->charset('iso-2022-jp');
$this->CakeEmail->headerCharset('iso-2022-jp');
$result = $this->CakeEmail->send($message);
$expected = "{$message}\r\n\r\n";
$this->assertEquals($expected, $result['message']);
}
/** /**
* Tests that the body is encoded using the configured charset * Tests that the body is encoded using the configured charset
* *