fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in julceslau/processmaker/HOR-2167 (pull request #5158)

Browse Source 
HOR-2167
This commit is contained in:
Paula Quispe
2016-11-23 21:44:37 +00:00
parent 576c08db68 d9b2a8086f
commit 2d37e9d8c1
4 changed files with 48 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/classes/class.case.php
View File

@@ -871,6 +871,24 @@ class Cases
return $aReturn;
}
public function array_key_intersect(&$a, &$b) {
$array = array();
while (list($key, $value) = each($a)) {
if (isset($b[$key])) {
if (is_object($b[$key]) && is_object($value)) {
if (serialize($b[$key]) === serialize($value)) {
$array[$key] = $value;
}
} else {
if ($b[$key] === $value) {
$array[$key] = $value;
}
}
}
}
return $array;
}
/*
* Update an existing case, this info is used in CaseResume
*
@@ -914,7 +932,7 @@ class Cases
//only when that variable is set.. from Save
$FieldsBefore = $this->loadCase($sAppUid);
$FieldsDifference = $this->arrayRecursiveDiff($FieldsBefore['APP_DATA'], $aApplicationFields);
$fieldsOnBoth = @array_intersect_assoc($FieldsBefore['APP_DATA'], $aApplicationFields);
$fieldsOnBoth = $this->array_key_intersect($FieldsBefore['APP_DATA'], $aApplicationFields);
//Add fields that weren't in previous version
foreach ($aApplicationFields as $key => $value) {
if (is_array($value) && isset($fieldsOnBoth[$key]) && is_array($fieldsOnBoth[$key])) {