From 212028cda2978e14bb16c931478eee67f6f83b9e Mon Sep 17 00:00:00 2001 From: Graham Weldon Date: Sun, 23 Oct 2011 00:23:50 +1100 Subject: [PATCH] Remove comments, and fix debug transport for email. --- lib/Cake/Network/Email/DebugTransport.php | 2 +- lib/Cake/Test/Case/Network/Email/DebugTransportTest.php | 3 +-- lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Network/Email/DebugTransport.php b/lib/Cake/Network/Email/DebugTransport.php index 22c0680d9..7287bcfee 100644 --- a/lib/Cake/Network/Email/DebugTransport.php +++ b/lib/Cake/Network/Email/DebugTransport.php @@ -32,7 +32,7 @@ class DebugTransport extends AbstractTransport { * @return array */ public function send(CakeEmail $email) { - $headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject')); + $headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'subject')); $headers = $this->_headersToString($headers); $message = implode("\r\n", (array)$email->message()); return array('headers' => $headers, 'message' => $message); diff --git a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php index 08a0c358d..3e8c98a1d 100644 --- a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php @@ -54,14 +54,13 @@ class DebugTransportTest extends CakeTestCase { $headers = "From: CakePHP Test \r\n"; $headers .= "To: CakePHP \r\n"; $headers .= "Cc: Mark Story , Juan Basso \r\n"; - $headers .= "Bcc: phpnut@cakephp.org\r\n"; $headers .= "X-Mailer: CakePHP Email\r\n"; $headers .= "Date: " . date(DATE_RFC2822) . "\r\n"; $headers .= "Message-ID: <4d9946cf-0a44-4907-88fe-1d0ccbdd56cb@localhost>\r\n"; $headers .= "Subject: Testing Message\r\n"; $headers .= "MIME-Version: 1.0\r\n"; $headers .= "Content-Type: text/plain; charset=UTF-8\r\n"; - $headers .= "Content-Transfer-Encoding: 7bit"; + $headers .= "Content-Transfer-Encoding: 8bit"; $data = "First Line\r\n"; $data .= "Second Line\r\n"; diff --git a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php index 7222abb57..5da648766 100644 --- a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php @@ -224,7 +224,6 @@ class SmtpTransportTest extends CakeTestCase { $data = "From: CakePHP Test \r\n"; $data .= "To: CakePHP \r\n"; $data .= "Cc: Mark Story , Juan Basso \r\n"; - //$data .= "Bcc: phpnut@cakephp.org\r\n"; $data .= "X-Mailer: CakePHP Email\r\n"; $data .= "Date: " . date(DATE_RFC2822) . "\r\n"; $data .= "Message-ID: <4d9946cf-0a44-4907-88fe-1d0ccbdd56cb@localhost>\r\n";