Merge branch '5.x' of https://github.com/spicywebau/craft-neo into 5.x

spicywebau · Jun 26, 2024 · a24d9c0 · a24d9c0
2 parents 8f2c047 + 472d022
commit a24d9c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,11 @@
 - Removed the `neoblocks_owners` table; the Craft 5 `elements_owners` table is used instead
 - Removed the `neoblocks.deletedWithOwner` column; the Craft 5 `elements.deletedWithOwner` column is used instead
 
+## 4.2.5 - 2024-06-24
+
+### Fixed
+- Fixed a bug where content migrations that set Neo field values could fail to set more than one block in some cases
+
 ## 4.2.4 - 2024-06-18
 
 ### Fixed

diff --git a/src/Field.php b/src/Field.php
@@ -1584,8 +1584,13 @@ private function _createBlocksFromSerializedData(array $value, ElementInterface
                 $baseBlockFieldNamespace .= '.blocks';
             }
         } else {
-            $newBlockData = $value;
-            $newSortOrder = array_keys($value);
+            $newBlockData = [];
+            $newSortOrder = [];
+
+            foreach ($value as $i => $blockData) {
+                $newBlockData["new$i"] = $blockData;
+                $newSortOrder[] = "new$i";
+            }
         }
 
         $blocks = [];