Merge branch '1.5' into 1.6

silverstripe · Aug 10, 2020 · 6aedf12 · 6aedf12
2 parents 6194fbc + fe896f8
commit 6aedf12
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/Versioned.php b/src/Versioned.php
@@ -1876,6 +1876,7 @@ public function doArchive()
      */
     public function doUnpublish()
     {
+        /** @var DataObject|Versioned $owner */
         $owner = $this->owner;
         // Skip if this record isn't saved
         if (!$owner->isInDB()) {
@@ -1893,9 +1894,16 @@ public function doUnpublish()
         static::withVersionedMode(function () use ($owner) {
             static::set_stage(static::LIVE);
 
-            // This way our ID won't be unset
-            $clone = clone $owner;
-            $clone->delete();
+            // Re-fetch the current DataObject to ensure we have data from the LIVE stage
+            // This is particularly relevant for DataObject's in a modified state so that
+            // any delete extensions have the correct database record values
+            /** @var DataObject|Versioned $obj */
+            $obj = $owner::get()->byID($owner->ID);
+            if (!$obj) {
+                return;
+            }
+            $obj->setDeleteWritesVersion($owner->getDeleteWritesVersion());
+            $obj->delete();
         });
 
         $owner->invokeWithExtensions('onAfterUnpublish');

diff --git a/tests/php/VersionedTest.php b/tests/php/VersionedTest.php
@@ -1588,4 +1588,21 @@ public function testWriteWithoutVersion()
             $versions
         );
     }
+
+    public function testLiveObjectDeletedOnUnpublish()
+    {
+        /** @var VersionedTest\TestObject|Versioned $obj */
+        $obj = new VersionedTest\TestObject();
+
+        // publish
+        $obj->Name = 'First name';
+        $obj->publishSingle();
+
+        // put into a modified state
+        $obj->Name = 'Second name';
+        $obj->write();
+
+        $obj->doUnpublish();
+        $this->assertEquals('First name', VersionedTest\TestObject::$nameValueOfObjectJustDeleted);
+    }
 }
diff --git a/tests/php/VersionedTest/TestObject.php b/tests/php/VersionedTest/TestObject.php
@@ -58,6 +58,11 @@ class TestObject extends DataObject implements TestOnly
      */
     public static $setNameWithoutVersionAfterPublish = null;
 
+    /**
+     * Used to record the $obj->Name value of the last object deleted
+     */
+    public static $nameValueOfObjectJustDeleted = '';
+
     public function canView($member = null)
     {
         $extended = $this->extendedCan(__FUNCTION__, $member);
@@ -74,4 +79,10 @@ public function onAfterPublish($original)
             $this->writeWithoutVersion();
         }
     }
+
+    public function onAfterDelete()
+    {
+        parent::onAfterDelete();
+        self::$nameValueOfObjectJustDeleted = $this->Name;
+    }
 }