From 36ab8ffd1117bf3b9f6c86682475e67e13371291 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 10 Jul 2015 20:42:26 -0400 Subject: [PATCH 1/2] PM-2890 0017477: Update in Variable convert special chars to unicode in the database Dynaform list dissapear Se cambio la forma de codificar valores utf8 --- .../src/ProcessMaker/BusinessModel/Variable.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index 44fbf9136..b4fc4b89c 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"]); + $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); + } + $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES)); $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"]); + $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); + } + $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES)); $variable->setVarAcceptedValues($encodeAcceptedValues); } $variable->save(); From 7f38aa4888262c930859185124fd183b98800a6d Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Mon, 13 Jul 2015 17:35:40 -0400 Subject: [PATCH 2/2] PM-2890 0017477: Update in Variable convert special chars to unicode in the database Dynaform list dissapear Se cambio la forma de codificar valores utf8 --- .../src/ProcessMaker/BusinessModel/Variable.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index b4fc4b89c..502fbfdf1 100755 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -77,10 +77,10 @@ class Variable if (isset($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"]); - $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); + $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)); + $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8'); $variable->setVarAcceptedValues($encodeAcceptedValues); } $variable->save(); @@ -175,10 +175,10 @@ class Variable if (isset($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"]); - $VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"]); + $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)); + $encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8'); $variable->setVarAcceptedValues($encodeAcceptedValues); } $variable->save();