From e76d3c459109d6d03f7dfed89c5be2605cda8730 Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Fri, 17 Nov 2023 16:21:52 +0000 Subject: [PATCH 1/2] fix for importing inner element fields --- src/base/Field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/Field.php b/src/base/Field.php index 3c457743..04fe39fe 100644 --- a/src/base/Field.php +++ b/src/base/Field.php @@ -167,7 +167,7 @@ protected function populateElementFields($elementIds, $nodeKey = null) // Arrayed content doesn't provide defaults because its unable to determine how many items it _should_ return // This also checks if there was any data that corresponds on the same array index/level as our element - $value = Hash::get($fieldValue, $nodeKey, $default); + $value = Hash::get($fieldValue, $nodeKey ?? $key, $default); if ($value) { $fieldData[$elementId][$fieldHandle] = $value; From 217501c73b637e0ed247cad9fb24a59271f4d3e4 Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Fri, 17 Nov 2023 16:34:22 +0000 Subject: [PATCH 2/2] php stan --- src/base/Field.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/base/Field.php b/src/base/Field.php index 04fe39fe..6215f158 100644 --- a/src/base/Field.php +++ b/src/base/Field.php @@ -167,6 +167,7 @@ protected function populateElementFields($elementIds, $nodeKey = null) // Arrayed content doesn't provide defaults because its unable to determine how many items it _should_ return // This also checks if there was any data that corresponds on the same array index/level as our element + /** @phpstan-ignore-next-line */ $value = Hash::get($fieldValue, $nodeKey ?? $key, $default); if ($value) {