fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-735 (pull request #4080)

Browse Source 
HOR-735
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-11 16:24:17 -04:00
parent 88fe91aae6 37d92d455d
commit eb773ac94e
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,6 +427,17 @@ function evaluateFunction ($aGrid, $sExpresion)
$pmScript->execute();
$aGrid[$i] = $pmScript->aFields;
//compatibility for var_label
foreach ($aFields as $j => $val) {
if (isset($aGrid[$i][$j . "_label"]) && empty($aGrid[$i][$j . "_label"]) && !empty($aGrid[$i][$j])) {
$aGrid[$i][$j . "_label"] = $aGrid[$i][$j];
}
if (substr($j, -6) !== "_label" && ($val !== $aGrid[$i][$j])) {
$aGrid[$i][$j . "_label"] = $aGrid[$i][$j];
}
}
//end
}
return $aGrid;
}