diff --git a/lib/Cake/Network/Email/SmtpTransport.php b/lib/Cake/Network/Email/SmtpTransport.php index b1d9d923667..cc58bdd966d 100644 --- a/lib/Cake/Network/Email/SmtpTransport.php +++ b/lib/Cake/Network/Email/SmtpTransport.php @@ -165,7 +165,7 @@ protected function _sendRcpt() { protected function _sendData() { $this->_smtpSend('DATA', '354'); - $headers = $this->_cakeEmail->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject')); + $headers = $this->_cakeEmail->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'subject')); $headers = $this->_headersToString($headers); $message = implode("\r\n", $this->_cakeEmail->message()); $this->_smtpSend($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n."); diff --git a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php index 7e1ba2b2f30..7222abb5704 100644 --- a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php +++ b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php @@ -224,14 +224,14 @@ public function testSendData() { $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 .= "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"; $data .= "Subject: Testing SMTP\r\n"; $data .= "MIME-Version: 1.0\r\n"; $data .= "Content-Type: text/plain; charset=UTF-8\r\n"; - $data .= "Content-Transfer-Encoding: 7bit\r\n"; + $data .= "Content-Transfer-Encoding: 8bit\r\n"; $data .= "\r\n"; $data .= "First Line\r\n"; $data .= "Second Line\r\n";