fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in mcuiza/processmaker/pm_2890 (pull request #2428)

Browse Source 
Pm_2890
This commit is contained in:
Julio Cesar Laura Avendaño
2015-07-14 11:15:26 -04:00
parent 1e25e6d36a 7f38aa4888
commit 96fb251a1f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -75,7 +75,12 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]); $variable->setVarDefault($arrayData["VAR_DEFAULT"]);
} }
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$encodeAcceptedValues = json_encode($arrayData["VAR_ACCEPTED_VALUES"]); $VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE, 'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE, 'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();
@@ -168,7 +173,12 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]); $variable->setVarDefault($arrayData["VAR_DEFAULT"]);
} }
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$encodeAcceptedValues = json_encode($arrayData["VAR_ACCEPTED_VALUES"]); $VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE,'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE,'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();