fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in release/3.4.1 (pull request #7104)

Browse Source 
PMC-1313

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-10-21 16:24:09 +00:00
committed by Julio Cesar Laura Avendaño
parent 1ad3d6ad62 08ae1b5560
commit 0bdb7ef59c
8 changed files with 261 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -385,6 +385,8 @@ class ActionsByEmail
$emailServer = new EmailServerModel();
$criteria = $emailServer->getEmailServer($dataRes['ABE_EMAIL_SERVER_UID']);
$setup = !empty($criteria) ? $criteria : $emailServer->getEmailServerDefault();
$setup['SMTPSecure'] = $setup['SMTPSECURE'];
unset($setup['SMTPSECURE']);
$spool = new SpoolRun();
$spool->setConfig($setup);
$abeCore = new ActionsByEmailCoreClass();

5
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1859,6 +1859,11 @@ class Cases
$arrayCaseVariable = array_merge($arrayCaseVariable, $dateHistory);
}
// Get the SYS_LANG defined, it can be updated
if (defined('SYS_LANG')) {
$arrayCaseVariable['SYS_LANG'] = SYS_LANG;
}
return $arrayCaseVariable;
}