Merged in gproly/processmaker/PM-4409 (pull request #3354)

PM-4409
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-10 11:05:30 -04:00
4 changed files with 15 additions and 22 deletions

View File

@@ -1194,10 +1194,17 @@ class DynaForm
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$d = @unserialize($row["HISTORY_DATA"]);
$jsonData = "";
if (isset($d["DYN_CONTENT_HISTORY"])) {
$decode = base64_decode($d["DYN_CONTENT_HISTORY"], true);
if ($decode !== false) {
$jsonData = $decode;
}
}
$data[] = array(
"history_date" => $row["HISTORY_DATE"],
"dyn_uid" => $row["DYN_UID"],
"dyn_content_history" => isset($d["DYN_CONTENT_HISTORY"]) ? $d["DYN_CONTENT_HISTORY"] : ""
"dyn_content_history" => $jsonData
);
}
return $data;