Fix Neo content sometimes being lost on provisional draft after revert

#899
spicywebau · Nov 13, 2024 · 8256544 · 8256544
1 parent 8e541ab
commit 8256544
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- Fixed a bug where reverting content on an entry with a provisional draft could cause Neo content on the provisional draft to be lost
+
 ## 4.2.19 - 2024-10-31
 
 ### Fixed

diff --git a/src/services/Fields.php b/src/services/Fields.php
@@ -860,7 +860,7 @@ public function mergeCanonicalChanges(Field $field, ElementInterface $owner): vo
                             $allBlocks[] = $derivativeBlock;
                         }
                     }
-                } elseif (!$canonicalBlock->trashed && $canonicalBlock->dateCreated > $owner->dateCreated) {
+                } elseif (!$canonicalBlock->trashed && $canonicalBlock->dateUpdated > $owner->dateCreated) {
                     $allBlocks[] = $newBlock = $elementsService->duplicateElement($canonicalBlock, [
                         'canonicalId' => $canonicalBlock->id,
                         'level' => $canonicalBlock->level,