adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 07:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent zero only lines from being emptied

Browse source
This commit is contained in:
ndm2 2014-11-18 17:26:31 +01:00
parent ddc3eee84c
commit bae556e73f
2 changed files with 20 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

@ -1359,7 +1359,7 @@ class CakeEmail {
$cut = ($wrapLength == CakeEmail::LINE_LENGTH_MUST); $cut = ($wrapLength == CakeEmail::LINE_LENGTH_MUST);
foreach ($lines as $line) { foreach ($lines as $line) {
if (empty($line)) { if (empty($line) && $line !== '0') {
$formatted[] = ''; $formatted[] = '';
continue; continue;
} }

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

@ -2416,6 +2416,25 @@ HTML;
$this->assertEquals($expected, $result['message']); $this->assertEquals($expected, $result['message']);
} }
/**
* testZeroOnlyLinesNotBeingEmptied()
*
* @return void
*/
public function testZeroOnlyLinesNotBeingEmptied() {
$message = "Lorem\r\n0\r\n0\r\nipsum";
$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 = "{$message}\r\n\r\n";
$this->assertEquals($expected, $result['message']);
}
/** /**
* CakeEmailTest::assertLineLengths() * CakeEmailTest::assertLineLengths()
* *