Merge branch '4' into 5

silverstripe · Sep 1, 2022 · d566825 · d566825
2 parents aa4ba82 + 2b8bee7
commit d566825
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -2080,7 +2080,7 @@ public function doRollback($data, $form)
         }
 
         if ($version) {
-            $record->doRollbackTo($version);
+            $record->rollbackRecursive($version);
             $message = _t(
                 __CLASS__ . '.ROLLEDBACKVERSIONv2',
                 "Rolled back to version #{version}.",

diff --git a/tests/php/Controllers/CMSSiteTreeFilterTest.php b/tests/php/Controllers/CMSSiteTreeFilterTest.php
@@ -108,7 +108,7 @@ public function testChangedPagesFilter()
         $changedPage->Title = 'Changed 2';
         $changedPage->write();
         $changedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
-        $changedPage->doRollbackTo($changedPageVersion);
+        $changedPage->rollbackRecursive($changedPageVersion);
 
         $f = new CMSSiteTreeFilter_ChangedPages(['Term' => 'Changed']);
         $results = $f->pagesIncluded();