Merge branch '4.x' into 5.x

spicywebau · Nov 19, 2024 · 77e52f2 · 77e52f2
2 parents 06344e0 + 7330e3d
commit 77e52f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -213,6 +213,14 @@
 - 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.21 - 2024-11-19
+
+### Changed
+- When running Craft garbage collection, Neo will now delete Neo block owner data where the owner has previously been deleted
+
+### Fixed
+- Fixed a Neo-to-Matrix conversion bug where disabled Neo blocks were being converted to enabled Matrix blocks
+
 ## 4.2.20 - 2024-11-13
 
 ### Fixed

diff --git a/src/services/Conversion.php b/src/services/Conversion.php
@@ -331,6 +331,9 @@ public function convertBlockToEntry(Block $neoBlock, ?EntryType $entryType = nul
         $entry->siteId = $neoBlock->siteId;
         $entry->sortOrder = $neoBlock->sortOrder;
         $entry->collapsed = $neoBlock->collapsed;
+        $entry->enabled = $neoBlock->enabled;
+        $entry->setEnabledForSite($neoBlock->getEnabledForSite());
+        $entry->setScenario($neoBlock->getScenario());
         $entry->setFieldValues($entryFieldValues);
 
         if ($entryType) {