fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-1403

Browse Source
This commit is contained in:
Paula Quispe
2020-06-18 17:12:09 -04:00
parent f5331b4c11
commit 8dfca660ef
2 changed files with 119 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/class.pmFunctions.php
View File

@@ -1083,11 +1083,15 @@ function PMFSendMessage(
global $oPMScript;
if (isset($oPMScript->aFields) && is_array($oPMScript->aFields)) {
if (is_array($emailTemplateVariables)) {
$emailTemplateVariables = array_merge($oPMScript->aFields, $emailTemplateVariables);
} else {
$emailTemplateVariables = $oPMScript->aFields;
if (isset($_SESSION['APPLICATION'])) {
if ($caseId == $_SESSION['APPLICATION']) {
if (isset($oPMScript->aFields) && is_array($oPMScript->aFields)) {
if (is_array($emailTemplateVariables)) {
$emailTemplateVariables = array_merge($oPMScript->aFields, $emailTemplateVariables);
} else {
$emailTemplateVariables = $oPMScript->aFields;
}
}
}
}
@@ -1112,7 +1116,6 @@ function PMFSendMessage(
if ($result->status_code == 0) {
return 1;
} else {
error_log($result->message);
return 0;
}
}