Skip to content
Snippets Groups Projects
Commit 25f88e8e authored by Uma's avatar Uma
Browse files

Merge branch 'phpMailer_Settings' into 'master'

Fixes #1227 phpMailer updated for UTF-8 default encoding

See merge request !537
parents 98d060f0 a7a409f7
No related branches found
No related tags found
No related merge requests found
......@@ -656,6 +656,8 @@ class PHPMailer
*/
public function __construct($exceptions = null)
{
global $default_charset;
$this->CharSet = $default_charset;
if ($exceptions !== null) {
$this->exceptions = (boolean)$exceptions;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment