Commit aed9a13d authored by sun's avatar sun

- #927646 by oadaeh: Fixed Bogus case of Cc and Bcc mail header fields.

parent a3819e10
PHPMailer 7.x-3.x, xxxx-xx-xx
-----------------------------
#927646 by oadaeh: Fixed Bogus case of Cc and Bcc mail header fields.
#811774 by InternetDevels.Com, sun: Fixed MimeMail integration.
#811774 by sun: Fixed duplicate disabled warning when submitting settings form.
#1188610 by sun: Fixed bogus variable $mail in exception handling.
......
......@@ -271,13 +271,13 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
$this->AddAddress($address['mail'], $address['name']);
}
// Extract CCs and BCCs from headers.
if (isset($message['headers']['CC'])) {
foreach (phpmailer_parse_address($message['headers']['CC']) as $address) {
if (isset($message['headers']['Cc'])) {
foreach (phpmailer_parse_address($message['headers']['Cc']) as $address) {
$this->AddCC($address['mail'], $address['name']);
}
}
if (isset($message['headers']['BCC'])) {
foreach (phpmailer_parse_address($message['headers']['BCC']) as $address) {
if (isset($message['headers']['Bcc'])) {
foreach (phpmailer_parse_address($message['headers']['Bcc']) as $address) {
$this->AddBCC($address['mail'], $address['name']);
}
}
......@@ -286,7 +286,7 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
// Reroute to debug e-mail address.
$this->AddAddress(variable_get('phpmailer_debug_email', ''));
}
unset($message['headers']['CC'], $message['headers']['BCC']);
unset($message['headers']['Cc'], $message['headers']['Bcc']);
// Extract Reply-To from headers.
if (isset($message['headers']['Reply-To'])) {
......
......@@ -38,13 +38,13 @@ function mimemail_phpmailer_send($message) {
$mail->AddAddress($address['mail']);
}
// Extract CCs and BCCs from headers.
if (isset($message['headers']['CC'])) {
foreach (phpmailer_parse_address($message['headers']['CC']) as $address) {
if (isset($message['headers']['Cc'])) {
foreach (phpmailer_parse_address($message['headers']['Cc']) as $address) {
$mail->AddCC($address['mail']);
}
}
if (isset($message['headers']['BCC'])) {
foreach (phpmailer_parse_address($message['headers']['BCC']) as $address) {
if (isset($message['headers']['Bcc'])) {
foreach (phpmailer_parse_address($message['headers']['Bcc']) as $address) {
$mail->AddBCC($address['mail']);
}
}
......@@ -54,7 +54,7 @@ function mimemail_phpmailer_send($message) {
$message['to'] = variable_get('phpmailer_debug_email', '');
$mail->AddAddress($message['to']);
}
unset($message['headers']['CC'], $message['headers']['BCC']);
unset($message['headers']['Cc'], $message['headers']['Bcc']);
$message['headers']['Date'] = $mail->RFCDate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment