[5.x] Fix wrong blueprint parent after revision publish (#11116)

statamic · Nov 12, 2024 · a0b09e5 · a0b09e5
1 parent 0323f2b
commit a0b09e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
@@ -321,7 +321,7 @@ public function setParent($parent)
     {
         $this->parent = $parent;
 
-        $this->resetFieldsCache();
+        $this->resetBlueprintCache()->resetFieldsCache();
 
         return $this;
     }

diff --git a/src/Revisions/Revisable.php b/src/Revisions/Revisable.php
@@ -108,6 +108,10 @@ public function publishWorkingCopy($options = [])
 
         $item->deleteWorkingCopy();
 
+        if ($item instanceof Entry) {
+            $item->blueprint()->setParent($item);
+        }
+
         return $item;
     }
 
@@ -133,6 +137,10 @@ public function unpublishWorkingCopy($options = [])
 
         $item->deleteWorkingCopy();
 
+        if ($item instanceof Entry) {
+            $item->blueprint()->setParent($item);
+        }
+
         return $item;
     }