Merged in release/3.3 (pull request #6641)

HOR-4897

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-10-09 15:01:06 +00:00
committed by Julio Cesar Laura Avendaño
11 changed files with 211 additions and 6 deletions

View File

@@ -411,6 +411,8 @@ class SpoolRun
}
break;
}
$systemConfiguration = System::getSystemConfiguration();
$oPHPMailer->Timeout = is_numeric($systemConfiguration['smtp_timeout']) ? $systemConfiguration['smtp_timeout'] : 20;
$oPHPMailer->CharSet = "UTF-8";
$oPHPMailer->Encoding = "8bit";
$oPHPMailer->Host = $this->config['MESS_SERVER'];