diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 6e42cc92810c4993c08f19a4f0054f874c6768b0..8607e253810dcddc0fa2b4a2b409e997ca830cbb 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -28,6 +28,7 @@ use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\DataHandling\Event\IsTableExcludedFromReferenceIndexEvent;
use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Versioning\VersionState;
/**
* Reference index processing and relation extraction
@@ -303,6 +304,14 @@ class ReferenceIndex implements LoggerAwareInterface
*/
protected function generateDataUsingRecord(string $tableName, array $record): array
{
+ if (BackendUtility::isTableWorkspaceEnabled($tableName)) {
+ // Never write relations for t3ver_state = 2 delete placeholder records
+ $versionState = VersionState::cast($record['t3ver_state'] ?? 0);
+ if ($versionState->equals(VersionState::DELETE_PLACEHOLDER)) {
+ return [];
+ }
+ }
+
$this->relations = [];
// Get all relations from record:
$recordRelations = $this->getRelations($tableName, $record);
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
index 7146098f210328ef9339c0f89d1710a4e5288d40..83e6d512d34d1257524e0714d8962609de215249 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
@@ -54,7 +54,3 @@
,"5aa620d796bedb2df9724db6d47487f8","tt_content",331,"image",,,,1,0,"sys_file_reference",129,,,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
-,"36f1ed8936df905a25f6454b259f05eb","sys_file_reference",130,"uid_local",,,,0,1,"sys_file",21,,,,,,,,
-,"69bd4dfe47d34722a1668f50c7f2deaa","sys_file_reference",131,"uid_local",,,,0,1,"sys_file",1,,,,,,,,
-,"4a9997099941b19dc087053b0d087362","tt_content",332,"image",,,,0,1,"sys_file_reference",130,,,,,,,,
-,"6c3a5722561aa19faa40a7c7742f686b","tt_content",332,"image",,,,1,1,"sys_file_reference",131,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
index 310c300f1c80518f7527934d795c7c090e989de7..b50a3fbc546c7331d71998d329e8daca2f9fb5ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
@@ -54,7 +54,5 @@
,"5aa620d796bedb2df9724db6d47487f8","tt_content",331,"image",,,,1,0,"sys_file_reference",129,,,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
-,"9215daa3af61696d9d2d6aac0f624a63","sys_file_reference",130,"uid_local",,,,0,1,"sys_file",1,,,,,,,,
-,"c0f878931452ab5b20a3198773f8e59e","sys_file_reference",131,"uid_local",,,,0,1,"sys_file",21,,,,,,,,
,"f098f1d38d94a2a30560ddac9c89f788","tt_content",332,"image",,,,0,1,"sys_file_reference",131,,,,,,,,
,"7c78b8e30579552db7f605e2c209ebb6","tt_content",332,"image",,,,1,1,"sys_file_reference",130,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
index d44fccbce11082f7b236bf4e0d2101253eacc8f1..5e586cf82356bb33d0f9d078b4fad0f66f9ca0ec 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
@@ -55,6 +55,5 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
,"9215daa3af61696d9d2d6aac0f624a63","sys_file_reference",130,"uid_local",,,,0,1,"sys_file",1,,,,,,,,
-,"c0f878931452ab5b20a3198773f8e59e","sys_file_reference",131,"uid_local",,,,0,1,"sys_file",21,,,,,,,,
,"4a9997099941b19dc087053b0d087362","tt_content",332,"image",,,,0,1,"sys_file_reference",130,,,,,,,,
,"6c3a5722561aa19faa40a7c7742f686b","tt_content",332,"image",,,,1,1,"sys_file_reference",131,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
index cd6329dffcfca006a4fd05f0183d4e21b9dd12d4..54e0cbb648372137eda1617a3e8241fb0777adb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
@@ -33,5 +33,3 @@
,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"f8a45d275a837e9f88de3b571457196a","tt_content",299,"tx_testdatahandler_group",,,,0,1,"tx_testdatahandler_element",2,,,,,,
-,"cf97d69b9929d23bc0ef8b8eadb92da3","tt_content",299,"tx_testdatahandler_group",,,,1,1,"tx_testdatahandler_element",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/modifyParentNDeleteHotelChild.csv
index b9770b3843d69c85cd5a03d1c7ba2a17fde69f78..8ca7b8b23e2f4bafb26760325c566dfeddd2b871 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/modifyParentNDeleteHotelChild.csv
@@ -60,5 +60,3 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,,,,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"6bff896211ced53c56b5693cec93b085","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,"tx_irretutorial_1ncsv_price",19,,,,,,
-,"ecba35a75355bd60295dcbc3aa90c30b","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",11,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
index 494a05b45386b7855787c6a7bf7939e881418bd1..db1c4386de7bbdc7f953299cf443f2a92c3b0b7a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
@@ -61,6 +61,3 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,,,,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"f92216ac7261befdce6bc4918bf9824b","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,"tx_irretutorial_1ncsv_price",14,,,,,,
-,"8140fd8f74b30ebbb5e9c7ce429cf0a8","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",9,,,,,,
-,"caad2222956222fafe344085ab7393ef","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 2b8b97c60dd4ca15897470a08eb62011ce7e377a..b2b501bfa642518928eff295980ba238df8c0f0b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -77,5 +77,3 @@
,"8140fd8f74b30ebbb5e9c7ce429cf0a8","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",9,,,,,,
,"c340bd2ce9d75d6283580fedaefa9a30","tx_irretutorial_1ncsv_hotel",6,"offers",,,,1,1,"tx_irretutorial_1ncsv_offer",10,,,,,,
,"caad2222956222fafe344085ab7393ef","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,,,
-,"6bff896211ced53c56b5693cec93b085","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,"tx_irretutorial_1ncsv_price",19,,,,,,
-,"ecba35a75355bd60295dcbc3aa90c30b","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",11,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNDeleteHotelChild.csv
index e1f14b32cb92c689fcf163f7c7d7924f140896f0..904e5fd65f49f9f69f46bdfcfd90d8db74143266 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNDeleteHotelChild.csv
@@ -59,5 +59,3 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,,,,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"6bff896211ced53c56b5693cec93b085","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,"tx_irretutorial_1ncsv_price",19,,,,,,
-,"ecba35a75355bd60295dcbc3aa90c30b","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",11,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
index 56357bc200719b0bbd6aaf7296f6b77b8d6995fe..7b79abba37a9650e46a9d35ea206e4af9a43dff3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -45,7 +45,6 @@
"sys_refindex",,,,,,,,,,,,,,,,,
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"054faee34565a031b01d0403ffab9129","pages",91,"tx_irretutorial_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
index 2e4e684f73db28200e9e6e756d67dc72c632da40..092029f9141f33d0599d7e1f05eecba19a115c20 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -54,15 +54,12 @@
,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 14c3497e9145f159bf4ae676805dfaa31592bb75..651b91643106c8ab50769fcbc48d414af37e4b81 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -63,7 +63,6 @@
,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
@@ -75,7 +74,6 @@
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
,"799d002fd079ca160e6db0d6d3c2273f","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
index 0f9b5e1f066892f3bf8463ad615e63219559e29e..4e286d661bf7de86ce50c46d7810353ed145d9d4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
@@ -41,5 +41,4 @@
,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
-,"cbf63549963077818db9099164f2798d","sys_category",32,"items",,,,0,1,"tt_content",297,,,,,,
,"e19100d609a435906e16432a41b55c72","sys_category",29,"items",,,,0,0,"tt_content",297,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
index 7399d2fcc3d254484d0dd85c31dfc0da0edfb52d..cbd9c94536c105c536a0036469770681dd3f8a6e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -35,7 +35,6 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index fba73f3b411072c0c65812f4b5349fa2a6696dc4..b951e2f6925cefb91e9adb65f911fb35f990f9fb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -38,6 +38,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
index 386bf8867ad1faa092dcaeb51a8bda219c2a4bb3..938d9ea3c881545d7694b67948dcd94ec8b47edb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -35,7 +35,6 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index 04becb2a9e081b998d6c28817a4588be909d7f39..cff5a7f54e4063b95201577c25416144700fb73a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -39,6 +39,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index 711ed4de1d10521b0b9355c1cbd48a191e7bdb04..c983e10bd7d6c10e1df00903a8d283148de10623 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -38,6 +38,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
index a114ef82d2d86f03b0f733c7d6192561ee2ffd01..d33e7698b03e2520255322ac8badb76e1c61c1f2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
@@ -22,8 +22,6 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string"
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,
-,"98a793c05985daac9bfc537e0d8fc08b","tt_content",299,"tx_testdatahandler_select",,,,0,1,"tx_testdatahandler_element",2,
-,"9e50e2d84c69c9f744701bb17b81abfd","tt_content",299,"tx_testdatahandler_select",,,,1,1,"tx_testdatahandler_element",3,
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,