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

PMC-916

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2019-07-01 11:49:26 -04:00
parent 6e9247fdb8
commit e486b40906
14 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1108,7 +1108,7 @@ class Consolidated
foreach ($G_FORM->fields as $key => $val) {
if ($fieldName == $val->name) {
if ($G_FORM->fields[$key]->sql != "") {
$sqlQuery = G::replaceDataField($G_FORM->fields[$key]->sql, $aFields ["APP_DATA"]);
$sqlQuery = G::replaceDataField($G_FORM->fields[$key]->sql, $aFields ["APP_DATA"], 'mysql', false);
}
if ((is_array($val->options)) && (!empty($val->options))) {
foreach ($val->options as $key1 => $val1) {

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

@@ -522,7 +522,7 @@ class EmailEvent
$emailTo,
'',
'',
G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']),
G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA'], 'mysql', false),
$contentFile['prf_filename'],
[],
[],