Fixed revision bug

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Added the “‘New’ Button Label” field setting. ([#159](https://github.com/craftcms/ckeditor/discussions/159))
 - Copy/pasting nested entry cards now duplicates the nested entries. ([#186](https://github.com/craftcms/ckeditor/issues/186), [#192](https://github.com/craftcms/ckeditor/pull/192))
 - Fixed a bug where it was possible to copy/paste nested entry cards between CKEditor fields. ([#192](https://github.com/craftcms/ckeditor/pull/192))
+- Fixed a bug where additional revisions were getting created when saving entries with CKEditor-nested entries.
 
 ## 4.0.0-beta.10 - 2024-03-12
 

src/Field.php

@@ -311,6 +311,10 @@ function(array $match) use ($oldEntryIds, $newEntryIds) {
         }
 
         if ($resave) {
+            // set resaving=true to avoid our EVENT_AFTER_PROPAGATE handler from dealing with the owner recursively,
+            // and to avoid a new revision getting created.
+            $owner->resaving = true;
+
             Craft::$app->getElements()->saveElement($owner, false, $propagate, false);
         }
     }

src/Plugin.php

@@ -89,21 +89,14 @@ public function init()
             }
         });
 
-        // keep track of which elements we're already in the middle of working on,
-        // so we don't end up redundantly maintaining nested elements
-        $activeElements = [];
-
-        Event::on(Element::class, Element::EVENT_AFTER_PROPAGATE, function(ModelEvent $event) use (&$activeElements) {
+        Event::on(Element::class, Element::EVENT_AFTER_PROPAGATE, function(ModelEvent $event) {
             /** @var Element $element */
             $element = $event->sender;
-            if (isset($activeElements[$element->id])) {
-                return;
-            }
-            $activeElements[$element->id] = true;
-            foreach ($this->entryManagers($element) as $entryManager) {
-                $entryManager->maintainNestedElements($element, $event->isNew);
+            if (!$element->resaving) {
+                foreach ($this->entryManagers($element) as $entryManager) {
+                    $entryManager->maintainNestedElements($element, $event->isNew);
+                }
             }
-            unset($activeElements[$element->id]);
         });
 
         Event::on(Element::class, Element::EVENT_BEFORE_DELETE, function(ModelEvent $event) {