Merge pull request #1365 from SLASH2NL/develop

Preventing array_merge_recursive with null value with super table, resolving #1364
craftcms · Nov 25, 2023 · a2f4f16 · a2f4f16
2 parents 7d5d6b9 + 50c382a
commit a2f4f16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/fields/SuperTable.php b/src/fields/SuperTable.php
@@ -101,7 +101,7 @@ public function parseField(): mixed
 
                 // Finish up with the content, also sort out cases where there's array content
                 if (isset($fieldData[$key]) && is_array($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;
                 }