friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1049 from MrPetovan/bug/9572-phpmailer-encoding 

[phpmailer] Ensure encoding is UTF-8 even when not using the SMTP configuration
pull/1052/head
Michael Vogel 2020-11-29 21:47:40 +01:00 committed by GitHub
parent 83df923675 341e51f13d
commit 52d86afc5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpmailer/phpmailer.php
View File

@ -37,14 +37,14 @@ function phpmailer_emailer_send_prepare(App $a, IEmail &$email)
// Passing `true` enables exceptions // Passing `true` enables exceptions
$mailer = new PHPMailer(true); $mailer = new PHPMailer(true);
try { try {
// Setup encoding.
$mailer->CharSet = 'UTF-8';
$mailer->Encoding = 'base64';
if (DI::config()->get('phpmailer', 'smtp')) { if (DI::config()->get('phpmailer', 'smtp')) {
// Set mailer to use SMTP // Set mailer to use SMTP
$mailer->isSMTP(); $mailer->isSMTP();
// Setup encoding.
$mailer->CharSet = 'UTF-8';
$mailer->Encoding = 'base64';
// Specify main and backup SMTP servers // Specify main and backup SMTP servers
$mailer->Host = DI::config()->get('phpmailer', 'smtp_server'); $mailer->Host = DI::config()->get('phpmailer', 'smtp_server');
$mailer->Port = DI::config()->get('phpmailer', 'smtp_port'); $mailer->Port = DI::config()->get('phpmailer', 'smtp_port');