fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/HOR-4894 (pull request #6636)

Browse Source 
HOR-4894

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Roly
2018-09-28 20:50:44 +00:00
committed by Paula Quispe
parent 64292cf2b6 e9c1816e57
commit e0cc0eec7e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/SpoolRun.php
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'];

3
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -63,7 +63,8 @@ class System
'disable_download_documents_session_validation' => 0,
'logs_max_files' => 60,
'logs_location' => '',
'logging_level' => 'INFO'
'logging_level' => 'INFO',
'smtp_timeout' => 20
);
/**