FIX Use canDelete, not the now-deleted canArchive (#2984)

silverstripe · Aug 19, 2024 · 03efd3a · 03efd3a
1 parent 6120e89
commit 03efd3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/code/BatchActions/CMSBatchAction_Archive.php b/code/BatchActions/CMSBatchAction_Archive.php
@@ -5,7 +5,6 @@
 use SilverStripe\ORM\SS_List;
 use SilverStripe\Admin\CMSBatchAction;
 use SilverStripe\Control\HTTPResponse;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Delete items batch action.
@@ -28,7 +27,6 @@ public function run(SS_List $pages): HTTPResponse
 
     public function applicablePages($ids)
     {
-        // canArchive() is deprecated, not $this->applicablePagesHelper()
-        return Deprecation::withNoReplacement(fn() => $this->applicablePagesHelper($ids, 'canArchive'));
+        return $this->applicablePagesHelper($ids, 'canDelete');
     }
 }
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -29,7 +29,6 @@
 use SilverStripe\Core\Environment;
 use SilverStripe\Core\Flushable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\Forms\DateField;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldGroup;
@@ -1998,8 +1997,7 @@ public function archive(array $data, Form $form): HTTPResponse
         if (!$record || !$record->exists()) {
             throw new HTTPResponse_Exception("Bad record ID #$id", 404);
         }
-        $canArchive = Deprecation::withNoReplacement(fn() => $record->canArchive());
-        if (!$canArchive) {
+        if (!$record->canDelete()) {
             return Security::permissionFailure();
         }