Merge pull request #1634 from craftcms/bugfix/1607-matrix-default-values-and-other-arrays-v6

only assign default values if we have the block field info

Author: angrybrad

src/fields/Matrix.php

@@ -101,6 +101,31 @@ public function parseField(): mixed
                 } else {
                     $fieldData[$key] = $parsedValue;
                 }
+
+                foreach ($blocks as $blockHandle => $fields) {
+                    if (isset($fields['fields'])) {
+                        foreach ($fields['fields'] as $fieldHandle => $fieldInfo) {
+                            $node = Hash::get($fieldInfo, 'node');
+                            if ($node === 'usedefault') {
+                                $key = $this->_getBlockKey($nodePathSegments, $blockHandle, $fieldHandle);
+
+                                $parsedValue = DataHelper::fetchSimpleValue($this->feedData, $fieldInfo);
+                                $fieldData[$key] = $parsedValue;
+                            }
+                        }
+                    }
+                    if (isset($fields['attributes'])) {
+                        foreach ($fields['attributes'] as $fieldHandle => $fieldInfo) {
+                            $node = Hash::get($fieldInfo, 'node');
+                            if ($node === 'usedefault') {
+                                $key = $this->_getBlockKey($nodePathSegments, $blockHandle, $fieldHandle);
+
+                                $parsedValue = DataHelper::fetchSimpleValue($this->feedData, $fieldInfo);
+                                $attributeData[$key] = $parsedValue;
+                            }
+                        }
+                    }
+                }
             }
 
             if ($attributeInfo) {
@@ -117,31 +142,6 @@ public function parseField(): mixed
                     $attributeData[$key] = $parsedValue;
                 }
             }
-
-            foreach ($blocks as $blockHandle => $fields) {
-                if (isset($fields['fields'])) {
-                    foreach ($fields['fields'] as $fieldHandle => $fieldInfo) {
-                        $node = Hash::get($fieldInfo, 'node');
-                        if ($node === 'usedefault') {
-                            $key = $this->_getBlockKey($nodePathSegments, $blockHandle, $fieldHandle);
-
-                            $parsedValue = DataHelper::fetchSimpleValue($this->feedData, $fieldInfo);
-                            $fieldData[$key] = $parsedValue;
-                        }
-                    }
-                }
-                if (isset($fields['attributes'])) {
-                    foreach ($fields['attributes'] as $fieldHandle => $fieldInfo) {
-                        $node = Hash::get($fieldInfo, 'node');
-                        if ($node === 'usedefault') {
-                            $key = $this->_getBlockKey($nodePathSegments, $blockHandle, $fieldHandle);
-
-                            $parsedValue = DataHelper::fetchSimpleValue($this->feedData, $fieldInfo);
-                            $attributeData[$key] = $parsedValue;
-                        }
-                    }
-                }
-            }
         }
 
         // Handle some complex fields that don't directly have nodes, but instead have nested properties mapped.