Merged in victorsl/processmaker/HOR-188-3018 (pull request #3667)
HOR-188
This commit is contained in:
@@ -594,7 +594,8 @@ class Light extends Api
|
|||||||
'/\|(' . $field . ')\|/i',
|
'/\|(' . $field . ')\|/i',
|
||||||
'|' . implode('|', array_keys($structure)) . '|',
|
'|' . implode('|', array_keys($structure)) . '|',
|
||||||
$arrayMatch
|
$arrayMatch
|
||||||
)
|
) &&
|
||||||
|
!is_array($structure[$arrayMatch[1]])
|
||||||
) {
|
) {
|
||||||
$newName = $structure[$arrayMatch[1]];
|
$newName = $structure[$arrayMatch[1]];
|
||||||
$newData[$newName] = is_null($value) ? "":$value;
|
$newData[$newName] = is_null($value) ? "":$value;
|
||||||
@@ -605,7 +606,8 @@ class Light extends Api
|
|||||||
'/\|(' . $field . ')\|/i',
|
'/\|(' . $field . ')\|/i',
|
||||||
'|' . implode('|', array_keys($str)) . '|',
|
'|' . implode('|', array_keys($str)) . '|',
|
||||||
$arrayMatch
|
$arrayMatch
|
||||||
)
|
) &&
|
||||||
|
!is_array($str[$arrayMatch[1]])
|
||||||
) {
|
) {
|
||||||
$newName = $str[$arrayMatch[1]];
|
$newName = $str[$arrayMatch[1]];
|
||||||
$newData[$name][$newName] = is_null($value) ? "":$value;
|
$newData[$name][$newName] = is_null($value) ? "":$value;
|
||||||
@@ -621,7 +623,8 @@ class Light extends Api
|
|||||||
'/\|(' . $field . ')\|/i',
|
'/\|(' . $field . ')\|/i',
|
||||||
'|' . implode('|', array_keys($structure)) . '|',
|
'|' . implode('|', array_keys($structure)) . '|',
|
||||||
$arrayMatch
|
$arrayMatch
|
||||||
)
|
) &&
|
||||||
|
!is_array($structure[$arrayMatch[1]])
|
||||||
) {
|
) {
|
||||||
$newName = $structure[$arrayMatch[1]];
|
$newName = $structure[$arrayMatch[1]];
|
||||||
$response[$newName] = is_null($d) ? "":$d;
|
$response[$newName] = is_null($d) ? "":$d;
|
||||||
@@ -632,7 +635,8 @@ class Light extends Api
|
|||||||
'/\|(' . $field . ')\|/i',
|
'/\|(' . $field . ')\|/i',
|
||||||
'|' . implode('|', array_keys($str)) .'|',
|
'|' . implode('|', array_keys($str)) .'|',
|
||||||
$arrayMatch
|
$arrayMatch
|
||||||
)
|
) &&
|
||||||
|
!is_array($str[$arrayMatch[1]])
|
||||||
) {
|
) {
|
||||||
$newName = $str[$arrayMatch[1]];
|
$newName = $str[$arrayMatch[1]];
|
||||||
$response[$name][$newName] = is_null($d) ? "":$d;
|
$response[$name][$newName] = is_null($d) ? "":$d;
|
||||||
|
|||||||
Reference in New Issue
Block a user