fernando/luos
1
0
Fork 0
Code Releases Activity

PM-2890

Browse Source 
0017477: Update in Variable convert special chars to unicode in the database Dynaform list dissapear

Se cambio la forma de codificar valores utf8
This commit is contained in:
marcelo.cuiza
2015-07-13 17:35:40 -04:00
parent 36ab8ffd11
commit 7f38aa4888
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,10 +77,10 @@ class Variable
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"]; $VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) { foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"]); $VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE, 'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE, 'UTF-8');
} }
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES)); $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();
@@ -175,10 +175,10 @@ class Variable
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"]; $VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) { foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"]); $VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE,'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE,'UTF-8');
} }
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES)); $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();