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

Merge branch 'fix_phpmailer_encoding_missmatch' into 'master'

#1227 sets phpmailer encoding to the encoding specified in config.inc.php when creating new instance of Vtiger_Mailer

See merge request !525
parents 0c59cc6f decd49bf
No related branches found
No related tags found
No related merge requests found
...@@ -27,8 +27,10 @@ class Vtiger_Mailer extends PHPMailer { ...@@ -27,8 +27,10 @@ class Vtiger_Mailer extends PHPMailer {
* Constructor * Constructor
*/ */
function __construct() { function __construct() {
global $default_charset;
parent::__construct(); parent::__construct();
$this->initialize(); $this->initialize();
$this->CharSet = $default_charset;
} }
/** /**
......
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