Skip to content

Commit

Permalink
Merge branch 'v4' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
angrybrad committed Nov 25, 2023
2 parents a2f4f16 + 51a9327 commit 3676bc1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/fields/SuperTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function parseField(): mixed
$parsedValue = $this->_parseSubField($nodePaths, $subFieldHandle, $subFieldInfo);

if (isset($fieldData[$key])) {
$fieldData[$key] = array_merge_recursive($fieldData[$key], $parsedValue);
$fieldData[$key] = is_array($parsedValue) ? array_merge_recursive($fieldData[$key], $parsedValue) : $fieldData[$key];
} else {
$fieldData[$key] = $parsedValue;
}
Expand Down

0 comments on commit 3676bc1

Please sign in to comment.