Commit 6c33838b authored by sun's avatar sun

by sun: Fixed PHP E_STRICT warnings.

parent 0f4ac3c4
PHPMailer 6.x-3.x, xxxx-xx-xx
-----------------------------
by sun: Fixed PHP E_STRICT warnings.
by smk-ka: Added a note to the README how to configure other popular
freemailers.
#749506 by smk-ka: Fixed 'invalid address' error caused by MIME encoded e-mail
......
......@@ -124,7 +124,7 @@ class DrupalPHPMailer extends PHPMailer {
*
* Note: messages should not end with a dot.
*/
public function SetLanguage() {
public function SetLanguage($langcode = 'en', $lang_path = 'language/') {
$this->language = array(
'provide_address' => t('You must provide at least one recipient e-mail address'),
'encoding' => t('Unknown encoding: '),
......
......@@ -23,7 +23,8 @@ function phpmailer_send($message) {
try {
// Parse 'From' e-mail address.
$from = reset(phpmailer_parse_address($message['from']));
$from = phpmailer_parse_address($message['from']);
$from = reset($from);
$mail->From = $from['mail'];
if ($from['name'] != '') {
$mail->FromName = $from['name'];
......
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