tobias/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #845 from kecalcze/UpdatePHPMailer

Browse source 
Fix phpmailer compatibility with latest stable friendica
This commit is contained in:
Hypolite Petovan 2019-04-12 08:24:36 -04:00 committed by GitHub
commit 3835705a41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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'));
} }
} }