[BUGFIX] DataHandler can modify soft-deleted records

lolli42 · lolli42 · commit 251950eaaee9 · 2025-04-03T15:17:55.000+02:00
This slipped through with #106382: DataHandler fetches records again in process_datamap() even if they are soft-deleted to allow modification of such records. An ext:content_defender functional test found this change in behavior. The patch fixes this again adds tests. Resolves: #106505 Related: #106382 Releases: main, 13.4 Change-Id: I14d48dba6d9d352ec8c2a52f5c21fa7ef2876df5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88934 Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: core-ci <typo3@b13.com> Tested-by: Benni Mack <benni@typo3.org> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Stefan Bürk <stefan@buerk.tech>
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -861,7 +861,7 @@ public function process_datamap(): void
                     $id = (int)$id;
                     $fieldArray = [];
                     $recordAccess = null;
-                    $currentRecord = BackendUtility::getRecord($table, $id);
+                    $currentRecord = BackendUtility::getRecord($table, $id, '*', '', false);
                     if (empty($currentRecord) || ($currentRecord['pid'] ?? null) === null) {
                         // Skip if there is no record. Skip if record has no pid column indicating incomplete DB.
                         continue;
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/AbstractActionTestCase.php
@@ -86,6 +86,12 @@ public function modifyContent(): void
         $this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, ['header' => 'Testing #1']);
     }
 
+    public function modifySoftDeletedContent(): void
+    {
+        $this->actionService->deleteRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);
+        $this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, ['header' => 'Testing #1']);
+    }
+
     public function modifyTranslatedContent(): void
     {
         $this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdThirdLocalized, ['header' => 'Testing Translation #3']);
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/Modify/ActionTest.php
@@ -76,6 +76,13 @@ public function modifyContent(): void
             ->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));
     }
 
+    #[Test]
+    public function modifySoftDeletedContent(): void
+    {
+        parent::modifySoftDeletedContent();
+        $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');
+    }
+
     #[Test]
     public function modifyTranslatedContent(): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/Modify/DataSet/modifySoftDeletedContent.csv b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/Modify/DataSet/modifySoftDeletedContent.csv
@@ -0,0 +1,28 @@
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","slug"
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
+,50,0,512,0,0,0,0,0,0,0,"Second Root Page","/"
+,51,50,128,0,0,0,0,0,0,0,"DataHandlerTest in second tree","/data-handler"
+,52,51,128,0,0,0,0,0,0,0,"Relations in second tree","/data-handler/relations"
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
+,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
+,91,88,256,0,1,89,0,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations"
+,92,88,256,0,2,89,0,0,0,0,"[Translate to Deutsch:] Relations","/data-handler/translate-to-deutsch-relations"
+"tt_content",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header"
+,200,88,256,0,0,0,0,0,0,0,0,"Regular Element #0"
+,201,88,512,0,-1,0,0,0,0,0,0,"Language all element"
+,297,89,384,0,0,0,0,0,0,0,0,"Regular Element #1"
+,298,89,512,1,0,0,0,0,0,0,0,"Testing #1"
+,299,89,768,0,0,0,0,0,0,0,0,"Regular Element #3"
+,300,89,1024,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
+,301,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
+,302,89,448,0,2,297,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+"sys_refindex"
+,"hash","tablename","recuid","field","hidden","starttime","endtime","t3ver_state","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_field","ref_hidden","ref_starttime","ref_endtime","ref_t3ver_state","ref_sorting","ref_string"
+,"02aa95a647ed365ffeeac881bd1af449","pages",91,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"14f90231b8565c61decd2aeaebea6034","pages",92,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"ca4f164be617724388f00923729e8558","tt_content",300,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",299,,0,0,2147483647,0,0,
+,"3676712de719382fe386617c1942c940","tt_content",301,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
+,"2b5621b6ac407f06a71e517bf98c9c94","tt_content",302,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesDiscard/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesDiscard/ActionTest.php
@@ -75,6 +75,14 @@ public function modifyContent(): void
         $this->assertCSVDataSet(__DIR__ . '/DataSet/modifyContent.csv');
     }
 
+    #[Test]
+    public function modifySoftDeletedContent(): void
+    {
+        parent::modifySoftDeletedContent();
+        $this->actionService->clearWorkspaceRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);
+        $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');
+    }
+
     #[Test]
     public function hideContent(): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesDiscard/DataSet/modifySoftDeletedContent.csv b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesDiscard/DataSet/modifySoftDeletedContent.csv
@@ -0,0 +1,35 @@
+"pages",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","hidden","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","slug",,,,,
+,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest","/",,,,,
+,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,,,,
+,89,88,256,0,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,,,,
+,90,88,512,0,0,0,0,0,0,0,0,"Target","/data-handler/target",,,,,
+,91,88,256,0,0,1,89,0,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations",,,,,
+,92,88,256,0,0,2,89,0,0,0,0,"[Translate to Deutsch:] Relations","/data-handler/translate-to-deutsch-relations",,,,,
+"sys_workspace",,,,,,,,,,,,,,,,,
+,"uid","pid","deleted","title","adminusers","members","db_mountpoints","file_mountpoints","freeze","live_edit","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage",,,,,,,,,,,,,,,,,
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","notification_defaults","allow_notificaton_settings",,,,,
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,0,0,,,,,
+"tt_content",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header",,,,
+,200,88,256,0,0,0,0,0,0,0,0,"Regular Element #0"
+,201,88,512,0,-1,0,0,0,0,0,0,"Language all element"
+,297,89,384,0,0,0,0,0,0,0,0,"Regular Element #1",,,,
+,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,,,
+,299,89,768,0,0,0,0,0,0,0,0,"Regular Element #3",,,,
+,300,89,1024,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,
+,301,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,
+,302,89,448,0,2,297,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,
+,320,89,512,0,0,0,0,2,2,0,298,"Regular Element #2",,,,
+"sys_refindex"
+,"hash","tablename","recuid","field","hidden","starttime","endtime","t3ver_state","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_field","ref_hidden","ref_starttime","ref_endtime","ref_t3ver_state","ref_sorting","ref_string"
+,"02aa95a647ed365ffeeac881bd1af449","pages",91,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"14f90231b8565c61decd2aeaebea6034","pages",92,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"6f85cfacfff942817392efe26ff1ade0","sys_workspace",1,"custom_stages",0,0,2147483647,0,,,,0,0,"sys_workspace_stage",1,,0,0,2147483647,0,0,
+,"96a6b7ec63daee0e0ce5d4908b6eda6f","sys_workspace_stage",1,"responsible_persons",0,0,2147483647,0,,,,0,0,"be_users",3,,0,0,2147483647,0,0,
+,"ca4f164be617724388f00923729e8558","tt_content",300,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",299,,0,0,2147483647,0,0,
+,"3676712de719382fe386617c1942c940","tt_content",301,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
+,"2b5621b6ac407f06a71e517bf98c9c94","tt_content",302,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesModify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesModify/ActionTest.php
@@ -98,6 +98,13 @@ public function modifyContent(): void
             ->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));
     }
 
+    #[Test]
+    public function modifySoftDeletedContent(): void
+    {
+        parent::modifySoftDeletedContent();
+        $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');
+    }
+
     #[Test]
     public function hideContent(): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesModify/DataSet/modifySoftDeletedContent.csv b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesModify/DataSet/modifySoftDeletedContent.csv
@@ -0,0 +1,36 @@
+"pages",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","hidden","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","slug",,,,
+,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest","/",,,,
+,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,,,
+,89,88,256,0,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,,,
+,90,88,512,0,0,0,0,0,0,0,0,"Target","/data-handler/target",,,,
+,91,88,256,0,0,1,89,0,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations",,,,
+,92,88,256,0,0,2,89,0,0,0,0,"[Translate to Deutsch:] Relations","/data-handler/translate-to-deutsch-relations",,,,
+"sys_workspace",,,,,,,,,,,,,,,,,
+,"uid","pid","deleted","title","adminusers","members","db_mountpoints","file_mountpoints","freeze","live_edit","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage",,,,,,,,,,,,,,,,,
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","notification_defaults","allow_notificaton_settings",,,,,
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,0,0,,,,,
+"tt_content",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header",,,,
+,200,88,256,0,0,0,0,0,0,0,0,"Regular Element #0"
+,201,88,512,0,-1,0,0,0,0,0,0,"Language all element"
+,297,89,384,0,0,0,0,0,0,0,0,"Regular Element #1",,,,
+,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,,,
+,299,89,768,0,0,0,0,0,0,0,0,"Regular Element #3",,,,
+,300,89,1024,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,
+,301,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,
+,302,89,448,0,2,297,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,
+,320,89,512,0,0,0,0,2,2,0,298,"Regular Element #2",,,,
+,321,89,512,0,0,0,0,1,2,0,298,"Testing #1",,,,
+"sys_refindex"
+,"hash","tablename","recuid","field","hidden","starttime","endtime","t3ver_state","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_field","ref_hidden","ref_starttime","ref_endtime","ref_t3ver_state","ref_sorting","ref_string"
+,"02aa95a647ed365ffeeac881bd1af449","pages",91,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"14f90231b8565c61decd2aeaebea6034","pages",92,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"6f85cfacfff942817392efe26ff1ade0","sys_workspace",1,"custom_stages",0,0,2147483647,0,,,,0,0,"sys_workspace_stage",1,,0,0,2147483647,0,0,
+,"96a6b7ec63daee0e0ce5d4908b6eda6f","sys_workspace_stage",1,"responsible_persons",0,0,2147483647,0,,,,0,0,"be_users",3,,0,0,2147483647,0,0,
+,"ca4f164be617724388f00923729e8558","tt_content",300,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",299,,0,0,2147483647,0,0,
+,"3676712de719382fe386617c1942c940","tt_content",301,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
+,"2b5621b6ac407f06a71e517bf98c9c94","tt_content",302,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublish/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublish/ActionTest.php
@@ -82,6 +82,14 @@ public function modifyContent(): void
             ->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));
     }
 
+    #[Test]
+    public function modifySoftDeletedContent(): void
+    {
+        parent::modifySoftDeletedContent();
+        $this->actionService->publishRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);
+        $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');
+    }
+
     #[Test]
     public function hideContent(): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublish/DataSet/modifySoftDeletedContent.csv b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublish/DataSet/modifySoftDeletedContent.csv
@@ -0,0 +1,34 @@
+"pages",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","hidden","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","slug",,,,,
+,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest","/",,,,,
+,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,,,,
+,89,88,256,0,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,,,,
+,90,88,512,0,0,0,0,0,0,0,0,"Target","/data-handler/target",,,,,
+,91,88,256,0,0,1,89,0,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations",,,,,
+,92,88,256,0,0,2,89,0,0,0,0,"[Translate to Deutsch:] Relations","/data-handler/translate-to-deutsch-relations",,,,,
+"sys_workspace",,,,,,,,,,,,,,,,,
+,"uid","pid","deleted","title","adminusers","members","db_mountpoints","file_mountpoints","freeze","live_edit","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage",,,,,,,,,,,,,,,,,
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","notification_defaults","allow_notificaton_settings",,,,,
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,0,0,,,,,
+"tt_content",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header",,,,
+,200,88,256,0,0,0,0,0,0,0,0,"Regular Element #0"
+,201,88,512,0,-1,0,0,0,0,0,0,"Language all element"
+,297,89,384,0,0,0,0,0,0,0,0,"Regular Element #1",,,,
+,298,89,512,1,0,0,0,0,0,0,0,"Testing #1",,,,
+,299,89,768,0,0,0,0,0,0,0,0,"Regular Element #3",,,,
+,300,89,1024,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,
+,301,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,
+,302,89,448,0,2,297,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,
+"sys_refindex"
+,"hash","tablename","recuid","field","hidden","starttime","endtime","t3ver_state","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_field","ref_hidden","ref_starttime","ref_endtime","ref_t3ver_state","ref_sorting","ref_string"
+,"02aa95a647ed365ffeeac881bd1af449","pages",91,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"14f90231b8565c61decd2aeaebea6034","pages",92,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"6f85cfacfff942817392efe26ff1ade0","sys_workspace",1,"custom_stages",0,0,2147483647,0,,,,0,0,"sys_workspace_stage",1,,0,0,2147483647,0,0,
+,"96a6b7ec63daee0e0ce5d4908b6eda6f","sys_workspace_stage",1,"responsible_persons",0,0,2147483647,0,,,,0,0,"be_users",3,,0,0,2147483647,0,0,
+,"ca4f164be617724388f00923729e8558","tt_content",300,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",299,,0,0,2147483647,0,0,
+,"3676712de719382fe386617c1942c940","tt_content",301,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
+,"2b5621b6ac407f06a71e517bf98c9c94","tt_content",302,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublishAll/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublishAll/ActionTest.php
@@ -77,6 +77,14 @@ public function modifyContent(): void
             ->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));
     }
 
+    #[Test]
+    public function modifySoftDeletedContent(): void
+    {
+        parent::modifySoftDeletedContent();
+        $this->actionService->publishWorkspace(self::VALUE_WorkspaceId);
+        $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');
+    }
+
     #[Test]
     public function hideContent(): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublishAll/DataSet/modifySoftDeletedContent.csv b/typo3/sysext/core/Tests/Functional/DataScenarios/Regular/WorkspacesPublishAll/DataSet/modifySoftDeletedContent.csv
@@ -0,0 +1,34 @@
+"pages",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","hidden","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","slug",,,,,
+,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest","/",,,,,
+,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,,,,
+,89,88,256,0,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,,,,
+,90,88,512,0,0,0,0,0,0,0,0,"Target","/data-handler/target",,,,,
+,91,88,256,0,0,1,89,0,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations",,,,,
+,92,88,256,0,0,2,89,0,0,0,0,"[Translate to Deutsch:] Relations","/data-handler/translate-to-deutsch-relations",,,,,
+"sys_workspace",,,,,,,,,,,,,,,,,
+,"uid","pid","deleted","title","adminusers","members","db_mountpoints","file_mountpoints","freeze","live_edit","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage",,,,,,,,,,,,,,,,,
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","notification_defaults","allow_notificaton_settings",,,,,
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,0,0,,,,,
+"tt_content",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header",,,,
+,200,88,256,0,0,0,0,0,0,0,0,"Regular Element #0"
+,201,88,512,0,-1,0,0,0,0,0,0,"Language all element"
+,297,89,384,0,0,0,0,0,0,0,0,"Regular Element #1",,,,
+,298,89,512,1,0,0,0,0,0,0,0,"Testing #1",,,,
+,299,89,768,0,0,0,0,0,0,0,0,"Regular Element #3",,,,
+,300,89,1024,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,
+,301,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,
+,302,89,448,0,2,297,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,
+"sys_refindex"
+,"hash","tablename","recuid","field","hidden","starttime","endtime","t3ver_state","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_field","ref_hidden","ref_starttime","ref_endtime","ref_t3ver_state","ref_sorting","ref_string"
+,"02aa95a647ed365ffeeac881bd1af449","pages",91,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"14f90231b8565c61decd2aeaebea6034","pages",92,"l10n_parent",0,0,2147483647,0,,,,0,0,"pages",89,,0,0,2147483647,0,0,
+,"6f85cfacfff942817392efe26ff1ade0","sys_workspace",1,"custom_stages",0,0,2147483647,0,,,,0,0,"sys_workspace_stage",1,,0,0,2147483647,0,0,
+,"96a6b7ec63daee0e0ce5d4908b6eda6f","sys_workspace_stage",1,"responsible_persons",0,0,2147483647,0,,,,0,0,"be_users",3,,0,0,2147483647,0,0,
+,"ca4f164be617724388f00923729e8558","tt_content",300,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",299,,0,0,2147483647,0,0,
+,"3676712de719382fe386617c1942c940","tt_content",301,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,
+,"2b5621b6ac407f06a71e517bf98c9c94","tt_content",302,"l18n_parent",0,0,2147483647,0,,,,0,0,"tt_content",297,,0,0,2147483647,0,0,

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,12 @@ public function modifyContent(): void`
`86`	`86`	`$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, ['header' => 'Testing #1']);`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ public function modifySoftDeletedContent(): void`
	`90`	`+ {`
	`91`	`+ $this->actionService->deleteRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);`
	`92`	`+ $this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, ['header' => 'Testing #1']);`
	`93`	`+ }`
	`94`	`+`
`89`	`95`	`public function modifyTranslatedContent(): void`
`90`	`96`	`{`
`91`	`97`	`$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdThirdLocalized, ['header' => 'Testing Translation #3']);`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,13 @@ public function modifyContent(): void`
`76`	`76`	`->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ #[Test]`
	`80`	`+ public function modifySoftDeletedContent(): void`
	`81`	`+ {`
	`82`	`+ parent::modifySoftDeletedContent();`
	`83`	`+ $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');`
	`84`	`+ }`
	`85`	`+`
`79`	`86`	`#[Test]`
`80`	`87`	`public function modifyTranslatedContent(): void`
`81`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ public function modifyContent(): void`
`75`	`75`	`$this->assertCSVDataSet(__DIR__ . '/DataSet/modifyContent.csv');`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ #[Test]`
	`79`	`+ public function modifySoftDeletedContent(): void`
	`80`	`+ {`
	`81`	`+ parent::modifySoftDeletedContent();`
	`82`	`+ $this->actionService->clearWorkspaceRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);`
	`83`	`+ $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');`
	`84`	`+ }`
	`85`	`+`
`78`	`86`	`#[Test]`
`79`	`87`	`public function hideContent(): void`
`80`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,13 @@ public function modifyContent(): void`
`98`	`98`	`->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ #[Test]`
	`102`	`+ public function modifySoftDeletedContent(): void`
	`103`	`+ {`
	`104`	`+ parent::modifySoftDeletedContent();`
	`105`	`+ $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');`
	`106`	`+ }`
	`107`	`+`
`101`	`108`	`#[Test]`
`102`	`109`	`public function hideContent(): void`
`103`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,14 @@ public function modifyContent(): void`
`82`	`82`	`->setTable(self::TABLE_Content)->setField('header')->setValues('Testing #1'));`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ #[Test]`
	`86`	`+ public function modifySoftDeletedContent(): void`
	`87`	`+ {`
	`88`	`+ parent::modifySoftDeletedContent();`
	`89`	`+ $this->actionService->publishRecord(self::TABLE_Content, self::VALUE_ContentIdSecond);`
	`90`	`+ $this->assertCSVDataSet(__DIR__ . '/DataSet/modifySoftDeletedContent.csv');`
	`91`	`+ }`
	`92`	`+`
`85`	`93`	`#[Test]`
`86`	`94`	`public function hideContent(): void`
`87`	`95`	`{`