Skip to content
Permalink
Browse files

do not pass 5th argument to mail() when in safe mode, even with a fal…

…sy value mail() will return false, fixes #3452
  • Loading branch information...
ceeram committed Dec 13, 2012
1 parent 45f6ade commit 53b465d64ea45dd19973034d914a092c235fea69
Showing with 9 additions and 9 deletions.
  1. +9 −9 lib/Cake/Network/Email/MailTransport.php
@@ -42,11 +42,7 @@ public function send(CakeEmail $email) {
$headers = $this->_headersToString($headers, $eol);
$message = implode($eol, $email->message());
$params = null;
if (!ini_get('safe_mode')) {
$params = isset($this->_config['additionalParameters']) ? $this->_config['additionalParameters'] : null;
}
$params = isset($this->_config['additionalParameters']) ? $this->_config['additionalParameters'] : null;
$this->_mail($to, $email->subject(), $message, $headers, $params);
return array('headers' => $headers, 'message' => $message);
}
@@ -58,16 +54,20 @@ public function send(CakeEmail $email) {
* @param string $subject email's subject
* @param string $message email's body
* @param string $headers email's custom headers
* @param string $params additional params for sending email
* @param string $params additional params for sending email, will be ignored when in safe_mode
* @throws SocketException if mail could not be sent
* @return void
*/
protected function _mail($to, $subject, $message, $headers, $params = null) {
//@codingStandardsIgnoreStart
if (!@mail($to, $subject, $message, $headers, $params)) {
if (ini_get('safe_mode')) {
//@codingStandardsIgnoreStart
if (!@mail($to, $subject, $message, $headers)) {
throw new SocketException(__d('cake_dev', 'Could not send email.'));
}
} elseif (!@mail($to, $subject, $message, $headers, $params)) {
//@codingStandardsIgnoreEnd
throw new SocketException(__d('cake_dev', 'Could not send email.'));
}
//@codingStandardsIgnoreEnd
}
}

0 comments on commit 53b465d

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