BUG Fix doRollbackTo() writing old / unsaved version over restored ve…

…rsion See warning on PHPDoc
silverstripe · Feb 19, 2018 · 8be3930 · 8be3930
1 parent b702a49
commit 8be3930
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Versioned.php b/src/Versioned.php
@@ -2325,7 +2325,6 @@ public function doRollbackTo($version)
         $owner = $this->owner;
         $owner->extend('onBeforeRollback', $version);
         $owner->copyVersionToStage($version, static::DRAFT, true);
-        $owner->writeWithoutVersion();
         $owner->extend('onAfterRollback', $version);
     }
 

diff --git a/tests/php/VersionedTest.php b/tests/php/VersionedTest.php
@@ -307,6 +307,7 @@ public function testPublishCreateNewVersion()
 
     public function testRollbackTo()
     {
+        /** @var VersionedTest\AnotherSubclass $page1 */
         $page1 = $this->objFromFixture(VersionedTest\AnotherSubclass::class, 'subclass1');
         $page1->Content = 'orig';
         $page1->write();
@@ -318,6 +319,7 @@ public function testRollbackTo()
         $page1->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
         $changedVersion = $page1->Version;
 
+        $page1->Content = 'should be discarded';
         $page1->doRollbackTo($origVersion);
         $page1 = Versioned::get_one_by_stage(
             VersionedTest\TestObject::class,