mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-05 17:42:54 +00:00
Merge pull request #845 from kecalcze/UpdatePHPMailer
Fix phpmailer compatibility with latest stable friendica
This commit is contained in:
commit
3835705a41
1 changed files with 4 additions and 1 deletions
|
@ -50,6 +50,9 @@ function phpmailer_emailer_send_prepare(App $a, array &$b)
|
|||
// Enable verbose debug output
|
||||
$mail->SMTPDebug = 2;
|
||||
*/
|
||||
// Setup encoding.
|
||||
$mail->CharSet = 'UTF-8';
|
||||
$mail->Encoding = 'base64';
|
||||
// Specify main and backup SMTP servers
|
||||
$mail->Host = Config::get('phpmailer', 'smtp_server');
|
||||
$mail->Port = Config::get('phpmailer', 'smtp_port');
|
||||
|
@ -66,7 +69,7 @@ function phpmailer_emailer_send_prepare(App $a, array &$b)
|
|||
}
|
||||
|
||||
if (Config::get('phpmailer', 'smtp_from')) {
|
||||
$mail->setFrom(Config::get('phpmailer', 'smtp_from'), Config::get('sitename'));
|
||||
$mail->setFrom(Config::get('phpmailer', 'smtp_from'), Config::get('config', 'sitename'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue