friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Fix phpmailer compatibility with latest stable friendica #845

Merged
kecalcze merged 2 commits from UpdatePHPMailer into develop 2019-04-12 14:24:37 +02:00
Conversation 3 Commits 2 Files changed 1 +4 -1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpmailer/phpmailer.php
View file

@ -50,6 +50,9 @@ function phpmailer_emailer_send_prepare(App $a, array &$b)
// Enable verbose debug output // Enable verbose debug output
$mail->SMTPDebug = 2; $mail->SMTPDebug = 2;
*/ */
// Setup encoding.
$mail->CharSet = 'UTF-8';
$mail->Encoding = 'base64';
// Specify main and backup SMTP servers // Specify main and backup SMTP servers
$mail->Host = Config::get('phpmailer', 'smtp_server'); $mail->Host = Config::get('phpmailer', 'smtp_server');
$mail->Port = Config::get('phpmailer', 'smtp_port'); $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')) { 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'));
} }
} }