diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index 44fbf9136..502fbfdf1 100755 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -75,7 +75,12 @@ class Variable $variable->setVarDefault($arrayData["VAR_DEFAULT"]); } 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->save(); @@ -168,7 +173,12 @@ class Variable $variable->setVarDefault($arrayData["VAR_DEFAULT"]); } 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->save();