[BUGFIX] Keep sorting column value for deleted records

Keep the value for the defined sorting field when a record is deleted. This improves the quality of restored records especially for tt_content records when a whole page is restored. This change might be breaking for functional tests in third-party extensions that rely on deleted records. Resolves: #84658 Releases: master Change-Id: I7714d73d07a8c78da56603230bde8ede6c02d8f4 Reviewed-on: https://review.typo3.org/56609 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de> Tested-by: Mathias Brodala <mbrodala@pagemachine.de> Tested-by: Jan Stockfisch <jan.stockfisch@googlemail.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com>
TYPO3 · Apr 9, 2018 · 9bdbb36 · 9bdbb36
1 parent 772e0e7
commit 9bdbb36
Show file tree

Hide file tree

Showing 82 changed files with 614 additions and 584 deletions.
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -5155,10 +5155,6 @@ public function deleteRecord($table, $uid, $noRecordCheck = false, $forceHardDel
             if ($GLOBALS['TCA'][$table]['ctrl']['tstamp']) {
                 $updateFields[$GLOBALS['TCA'][$table]['ctrl']['tstamp']] = $GLOBALS['EXEC_TIME'];
             }
-            // If the table is sorted, then the sorting number is set very high
-            if ($GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$undeleteRecord) {
-                $updateFields[$GLOBALS['TCA'][$table]['ctrl']['sortby']] = 1000000000;
-            }
             // before (un-)deleting this record, check for child records or references
             $this->deleteRecord_procFields($table, $uid, $undeleteRecord);
             try {

diff --git a/...Documentation/Changelog/master/Important-84658-KeepSortingForDeletedRecords.rst b/...Documentation/Changelog/master/Important-84658-KeepSortingForDeletedRecords.rst
@@ -0,0 +1,34 @@
+.. include:: ../../Includes.txt
+
+===========================================================
+Important: #84658 - Keep sorting  value for deleted records
+===========================================================
+
+See :issue:`84658`
+
+
+Description
+===========
+
+Keep the value for the defined sorting field when a record is deleted.
+
+
+Impact
+======
+
+Functional tests that are based on sorting value to be 1000000000 for deleted records will fail.
+
+
+Affected Installations
+======================
+
+All third party extensions with functional tests using the sorting field for deleted records.
+
+
+Migration
+=========
+
+Check your functional tests fixtures and set the expected sorting value for deleted records equal to
+the starting value.
+
+.. index:: NotScanned
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
@@ -7,4 +7,4 @@
 "tt_content",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
-,331,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
+,331,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
diff --git a/...ysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv b/...ysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
@@ -7,7 +7,7 @@
 "tt_content",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_group"
 ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
 "tx_testdatahandler_element",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
 ,1,89,256,0,0,0,0,0,0,0,0,0,"Element #1",

diff --git a/...ysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv b/...ysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
@@ -10,6 +10,6 @@
 ,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
 "tx_testdatahandler_element",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
-,1,89,1000000000,1,0,0,0,0,0,0,0,0,"Element #1",
+,1,89,256,1,0,0,0,0,0,0,0,0,"Element #1",
 ,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
 ,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
@@ -2,29 +2,29 @@
 ,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",,,
 ,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
 ,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
-,89,88,1000000000,1,0,0,0,0,0,0,"Relations",,,
+,89,88,256,1,0,0,0,0,0,0,"Relations",,,
 ,90,88,512,0,0,0,0,0,0,0,"Target",,,
 "tt_content",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
-,297,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
+,297,89,256,1,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
 "tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
-,3,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
-,4,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #2",7
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1",8
+,3,89,256,1,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
+,4,89,128,1,0,0,0,0,0,0,0,0,"Hotel #2",7
+,5,89,64,1,0,0,0,0,0,0,0,0,"Hotel #1",8
 "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
-,6,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
+,5,89,256,1,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
+,6,89,128,1,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
+,7,89,64,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
+,8,89,32,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
 "tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.2",
-,9,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.3",
-,10,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.2.1",
-,11,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.2.2",
-,12,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
-,13,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,7,89,256,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,8,89,128,1,0,0,0,0,0,0,0,0,"Price #1.1.2",
+,9,89,64,1,0,0,0,0,0,0,0,0,"Price #1.1.3",
+,10,89,32,1,0,0,0,0,0,0,0,0,"Price #1.2.1",
+,11,89,16,1,0,0,0,0,0,0,0,0,"Price #1.2.2",
+,12,89,8,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
+,13,89,4,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/...sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv b/...sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
@@ -1,18 +1,18 @@
 "tt_content",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
 "tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
 ,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
 ,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1",8
+,5,89,64,1,0,0,0,0,0,0,0,0,"Hotel #1",8
 "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
 ,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
 ,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
 ,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
+,8,89,32,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
 "tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
 ,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -21,4 +21,4 @@
 ,10,89,32,0,0,0,0,0,0,0,0,0,"Price #1.2.1",
 ,11,89,16,0,0,0,0,0,0,0,0,0,"Price #1.2.2",
 ,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
-,13,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,13,89,4,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/...e/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/...e/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -5,13 +5,13 @@
 "tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
 ,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
-,4,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #2",7
+,4,89,128,1,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
 ,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
 ,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
+,7,89,64,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
 ,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
 "tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
@@ -20,5 +20,5 @@
 ,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
 ,10,89,32,0,0,0,0,0,0,0,0,0,"Price #1.2.1",
 ,11,89,16,0,0,0,0,0,0,0,0,0,"Price #1.2.2",
-,12,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
+,12,89,8,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
 ,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/...sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/...sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -2,30 +2,30 @@
 ,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
-,89,88,1000000000,1,0,0,0,0,0,0,"Relations",1,,,,,
+,89,88,256,1,0,0,0,0,0,0,"Relations",1,,,,,
 ,90,88,512,0,0,0,0,0,0,0,"Target",0,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
+,297,89,256,1,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,2,89,1,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
+,3,89,1,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
+,4,89,2,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
+,5,89,1,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,5,89,1,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,6,89,2,1,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,7,89,1,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,8,89,1,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,8,89,2,1,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,9,89,3,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,10,89,1,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,11,89,2,1,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,12,89,1,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,13,89,1,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/...re/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/...re/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -1,19 +1,19 @@
 "tt_content",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
 ,3,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
 ,4,89,2,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,5,89,1,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
 ,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
 ,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,8,89,1,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
 ,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -22,4 +22,4 @@
 ,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
 ,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
 ,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,13,89,1,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/...onal/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/...onal/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -15,7 +15,7 @@
 ,3,89,1024,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
 ,4,89,1536,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
 ,5,89,1280,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1000000000,1,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
+,6,89,1,1,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,1,0,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
 ,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,9,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0

diff --git a/...unctional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/...unctional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -6,13 +6,13 @@
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
 ,3,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1000000000,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
+,4,89,2,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
 ,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
 ,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1000000000,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,7,89,1,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
 ,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
@@ -21,5 +21,5 @@
 ,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
 ,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
 ,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1000000000,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,12,89,1,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
 ,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/...core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv b/...core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
@@ -1,6 +1,6 @@
 "sys_category",,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parent","items"
-,28,0,1000000000,1,0,0,0,0,0,0,0,0,"Category A",0,0
+,28,0,256,1,0,0,0,0,0,0,0,0,"Category A",0,0
 ,29,0,512,0,0,0,0,0,0,0,0,0,"Category B",0,0
 ,30,0,768,0,0,0,0,0,0,0,0,0,"Category C",0,0
 ,31,0,1024,0,0,0,0,0,0,0,0,0,"Category A.A",28,0

diff --git a/.../core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv b/.../core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
@@ -13,4 +13,4 @@
 "tt_content",,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories"
 ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
+,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header"
 ,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0"
 ,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1"
-,298,89,1000000000,1,0,0,0,0,0,0,0,0,0,"Regular Element #2"
+,298,89,512,1,0,0,0,0,0,0,0,0,0,"Regular Element #2"
 ,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3"
 ,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
 ,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"

diff --git a/...s/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv b/...s/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -3,7 +3,7 @@
 ,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0"
 ,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1"
 ,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2"
-,299,89,1000000000,1,0,0,0,0,0,0,0,0,0,"Regular Element #3"
-,300,89,1000000000,1,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
+,299,89,768,1,0,0,0,0,0,0,0,0,0,"Regular Element #3"
+,300,89,1024,1,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
 ,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
 ,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"