save the non-revisable data

statamic · Dec 13, 2024 · 59c9267 · 59c9267
1 parent cac88a7
commit 59c9267
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
@@ -701,7 +701,7 @@ public function makeFromRevision($revision)
 
         $entry
             ->published($attrs['published'])
-            ->data($attrs['data'])
+            ->data(array_merge($this->data()->all(), $attrs['data']))
             ->slug($attrs['slug']);
 
         if ($this->collection()->dated() && ($date = Arr::get($attrs, 'date'))) {

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -262,7 +262,8 @@ public function update(Request $request, $collection, $entry)
                 ->save();
 
             // catch any changes through RevisionSaving event
-            $entry = $entry->fromWorkingCopy();
+            // have to save in case there are non-revisable fields
+            $entry = tap($entry->fromWorkingCopy())->save();
         } else {
             if (! $entry->revisionsEnabled() && User::current()->can('publish', $entry)) {
                 $entry->published($request->published);