From c56fcba3114dfe1d586c238cdea5a5ec0b55e055 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Fri, 19 Sep 2014 19:22:19 +0200
Subject: [PATCH] [BUGFIX] Child sorting is lost after publishing workspace
 data

If sorting of IRRE child records is changed in a workspace and
published, the sorting of child records is not published along.

This behaviour could be solved by using proper move placeholders
for IRRE child records as well, but conflicts with the
possibility to define a custom sorting field in the parent
entity of the relation construct. Besides that, sorting
values are not published in any case. That's why a
post-processing of IRRE children is required for sorting.

Resolves: #61750
Releases: master, 6.2
Change-Id: I80405299103b039b192626e20fcd74a05f96795f
Reviewed-on: http://review.typo3.org/32894
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
---
 .../version/Classes/Hook/DataHandlerHook.php  | 75 +++++++++++++++++++
 .../Publish/DataSet/changeContentSorting.csv  |  4 +-
 .../FAL/Publish/DataSet/copyContent.csv       |  4 +-
 .../FAL/Publish/DataSet/localizeContent.csv   |  4 +-
 .../FAL/Publish/DataSet/modifyContent.csv     |  4 +-
 .../DataSet/moveContentToDifferentPage.csv    |  4 +-
 ...veContentToDifferentPageNChangeSorting.csv |  8 +-
 .../DataSet/changeContentSorting.csv          |  4 +-
 .../FAL/PublishAll/DataSet/copyContent.csv    |  4 +-
 .../PublishAll/DataSet/localizeContent.csv    |  4 +-
 .../FAL/PublishAll/DataSet/modifyContent.csv  |  4 +-
 .../DataSet/moveContentToDifferentPage.csv    |  4 +-
 ...veContentToDifferentPageNChangeSorting.csv |  8 +-
 .../DataSet/changeParentContentSorting.csv    | 22 +++---
 .../ForeignField/Publish/DataSet/copyPage.csv | 12 +--
 .../copyPageWHotelBeforeParentContent.csv     | 10 +--
 ...alizeParentContentNHotelNOfferChildren.csv |  4 +-
 ...lNOfferChildrenNDiscardLocalizedParent.csv |  4 +-
 .../moveParentContentToDifferentPage.csv      |  6 +-
 ...ntContentToDifferentPageNChangeSorting.csv | 28 +++----
 .../DataSet/changeParentContentSorting.csv    | 22 +++---
 .../PublishAll/DataSet/copyPage.csv           | 12 +--
 .../copyPageWHotelBeforeParentContent.csv     | 10 +--
 ...alizeParentContentNHotelNOfferChildren.csv |  4 +-
 ...lNOfferChildrenNDiscardLocalizedParent.csv |  4 +-
 .../moveParentContentToDifferentPage.csv      |  6 +-
 ...ntContentToDifferentPageNChangeSorting.csv | 28 +++----
 27 files changed, 189 insertions(+), 114 deletions(-)

diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 589d1235d64a..49a3d7377057 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -886,6 +886,12 @@ class DataHandlerHook {
 				}
 			}
 		}
+		// Take care of relations in each field (e.g. IRRE):
+		if (is_array($GLOBALS['TCA'][$table]['columns'])) {
+			foreach ($GLOBALS['TCA'][$table]['columns'] as $field => $fieldConf) {
+				$this->version_swap_processFields($table, $field, $fieldConf['config'], $curVersion, $swapVersion, $tcemainObj);
+			}
+		}
 		unset($swapVersion['uid']);
 		// Modify online version to become offline:
 		unset($curVersion['uid']);
@@ -1013,6 +1019,75 @@ class DataHandlerHook {
 		$dbAnalysis->writeForeignField($configuration, $parentId);
 	}
 
+	/**
+	 * Processes fields of a record for the publishing/swapping process.
+	 * Basically this takes care of IRRE (type "inline") child references.
+	 *
+	 * @param string $tableName Table name
+	 * @param string $fieldName: Field name
+	 * @param array $configuration TCA field configuration
+	 * @param array $liveData: Live record data
+	 * @param array $versionData: Version record data
+	 * @param DataHandler $dataHandler Calling data-handler object
+	 * @return void
+	 */
+	protected function version_swap_processFields($tableName, $fieldName, array $configuration, array $liveData, array $versionData, DataHandler $dataHandler) {
+		$inlineType = $dataHandler->getInlineFieldType($configuration);
+		if ($inlineType !== 'field') {
+			return;
+		}
+		$foreignTable = $configuration['foreign_table'];
+		// Read relations that point to the current record (e.g. live record):
+		$liveRelations = $this->createRelationHandlerInstance();
+		$liveRelations->setWorkspaceId(0);
+		$liveRelations->start('', $foreignTable, '', $liveData['uid'], $tableName, $configuration);
+		// Read relations that point to the record to be swapped with e.g. draft record):
+		$versionRelations = $this->createRelationHandlerInstance();
+		$versionRelations->setUseLiveReferenceIds(FALSE);
+		$versionRelations->start('', $foreignTable, '', $versionData['uid'], $tableName, $configuration);
+		// Update relations for both (workspace/versioning) sites:
+		if (count($liveRelations->itemArray)) {
+			$dataHandler->addRemapAction(
+					$tableName, $liveData['uid'],
+					array($this, 'updateInlineForeignFieldSorting'),
+					array($tableName, $liveData['uid'], $foreignTable, $liveRelations->tableArray[$foreignTable], $configuration, $dataHandler->BE_USER->workspace)
+			);
+		}
+		if (count($versionRelations->itemArray)) {
+			$dataHandler->addRemapAction(
+					$tableName, $liveData['uid'],
+					array($this, 'updateInlineForeignFieldSorting'),
+					array($tableName, $liveData['uid'], $foreignTable, $versionRelations->tableArray[$foreignTable], $configuration, 0)
+			);
+		}
+	}
+
+	/**
+	 * Updates foreign field sorting values of versioned and live
+	 * parents after(!) the whole structure has been published.
+	 *
+	 * This method is used as callback function in
+	 * DataHandlerHook::version_swap_procBasedOnFieldType().
+	 * Sorting fields ("sortby") are not modified during the
+	 * workspace publishing/swapping process directly.
+	 *
+	 * @param string $parentTableName
+	 * @param string $parentId
+	 * @param string $foreignTableName
+	 * @param array|int[] $foreignIds
+	 * @param array $configuration
+	 * @param int $targetWorkspaceId
+	 * @return void
+	 * @internal
+	 */
+	public function updateInlineForeignFieldSorting($parentTableName, $parentId, $foreignTableName, $foreignIds, array $configuration, $targetWorkspaceId) {
+		$relationHandler = $this->createRelationHandlerInstance();
+		$relationHandler->setWorkspaceId($targetWorkspaceId);
+		$relationHandler->start(implode(',', $foreignIds), $foreignTableName, '', $parentId, $parentTableName, $configuration);
+		$relationHandler->processDeletePlaceholder();
+		$relationHandler->writeForeignField($configuration, $parentId);
+	}
+
 	/**
 	 * Release version from this workspace (and into "Live" workspace but as an offline version).
 	 *
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
index 53a962330ba9..7f5021088b88 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
@@ -1,7 +1,7 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,10,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,10,sys_file,Kasper,,,,
+,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,1,sys_file,T3BOARD,,,,
+,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,2,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
index 7a0c67b36efb..ef804c888938 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
@@ -4,8 +4,8 @@ sys_file_reference
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"This is Kasper",,,,
+,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
index ae5efcef97ab..9be9e625508f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
@@ -4,8 +4,8 @@ sys_file_reference
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
index 1db90c2d15b1..dd2229c25aa3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
@@ -2,8 +2,8 @@ sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
 ,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
index 3c6b66aa7cbe..4b3f51b5dff5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
@@ -2,8 +2,8 @@ sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
 ,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 46c65ae0c049..638d20f0438f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -1,9 +1,9 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,10,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,10,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,1,sys_file,T3BOARD,,,,
+,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,2,sys_file,Kasper,,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,132,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
index 53a962330ba9..7f5021088b88 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
@@ -1,7 +1,7 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,10,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,10,sys_file,Kasper,,,,
+,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,1,sys_file,T3BOARD,,,,
+,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,2,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
index 7a0c67b36efb..ef804c888938 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
@@ -4,8 +4,8 @@ sys_file_reference
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"This is Kasper",,,,
+,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
index ae5efcef97ab..9be9e625508f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
@@ -4,8 +4,8 @@ sys_file_reference
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
 ,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
index 1db90c2d15b1..dd2229c25aa3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
@@ -2,8 +2,8 @@ sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
 ,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
index 3c6b66aa7cbe..4b3f51b5dff5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
@@ -2,8 +2,8 @@ sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
 ,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 ,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 46c65ae0c049..638d20f0438f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -1,9 +1,9 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,downloadname
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,10,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,10,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,10,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,10,sys_file,"This is Kasper",,,,
+,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,1,sys_file,T3BOARD,,,,
+,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,2,sys_file,Kasper,,,,
+,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 ,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 ,132,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
index 858d9b3d17ae..80837804970d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
@@ -5,28 +5,28 @@ tt_content
 ,299,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",2
 tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
-,3,89,512,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
-,4,89,256,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
+,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
+,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
 ,5,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,3,0,"Hotel #1",297,tt_content,,2
 ,7,-1,2,0,0,0,0,0,0,4,0,"Hotel #2",297,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
-,5,89,512,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
-,6,89,256,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
-,7,89,128,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
+,5,89,2,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
+,6,89,1,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1280,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,5,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,10,-1,2,0,0,0,0,0,0,6,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,11,-1,1,0,0,0,0,0,0,7,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
-,7,89,512,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
-,8,89,256,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
-,9,89,128,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
-,10,89,64,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
-,11,89,32,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
-,12,89,16,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
+,7,89,3,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
+,9,89,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
+,10,89,2,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
+,11,89,1,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1536,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,7,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
 ,15,-1,2,0,0,0,0,0,0,8,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
index 4f4972a73ea5..e89cec2ef3de 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
@@ -16,7 +16,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,1,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,"Hotel #2",297,tt_content,,1
 ,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,91,768,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,91,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,91,1,0,0,0,0,0,0,0,0,"Hotel #1",301,tt_content,,2
 ,10,91,2,0,0,0,0,0,0,0,0,"Hotel #2",301,tt_content,,1
 tx_irretutorial_1nff_offer
@@ -25,7 +25,7 @@ tx_irretutorial_1nff_offer
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,91,768,0,0,0,0,0,0,0,0,"Offer #1.1",6,tx_irretutorial_1nff_hotel,,1
+,9,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",6,tx_irretutorial_1nff_hotel,,1
 ,11,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",8,tx_irretutorial_1nff_hotel,,3
 ,13,91,2,0,0,0,0,0,0,0,0,"Offer #1.2",8,tx_irretutorial_1nff_hotel,,2
 ,15,91,1,0,0,0,0,0,0,0,0,"Offer #2.1",10,tx_irretutorial_1nff_hotel,,1
@@ -38,10 +38,10 @@ tx_irretutorial_1nff_price
 ,11,89,2,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
-,14,91,1536,0,0,0,0,0,0,0,0,"Price #1.1.1",9,tx_irretutorial_1nff_offer,
-,16,91,768,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
-,18,91,1024,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
-,20,91,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
+,14,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",9,tx_irretutorial_1nff_offer,
+,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
+,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,tx_irretutorial_1nff_offer,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,tx_irretutorial_1nff_offer,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",15,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
index 6921e38755e7..21ea659174b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -25,7 +25,7 @@ tx_irretutorial_1nff_offer
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,91,768,0,0,0,0,0,0,0,0,"Offer #2.1",6,tx_irretutorial_1nff_hotel,,1
+,9,91,1,0,0,0,0,0,0,0,0,"Offer #2.1",6,tx_irretutorial_1nff_hotel,,1
 ,11,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",8,tx_irretutorial_1nff_hotel,,3
 ,13,91,2,0,0,0,0,0,0,0,0,"Offer #1.2",8,tx_irretutorial_1nff_hotel,,2
 ,15,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",10,tx_irretutorial_1nff_hotel,,1
@@ -38,10 +38,10 @@ tx_irretutorial_1nff_price
 ,11,89,2,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
-,14,91,1536,0,0,0,0,0,0,0,0,"Price #2.1.1",9,tx_irretutorial_1nff_offer,
-,16,91,768,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
-,18,91,1024,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
-,20,91,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
+,14,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",9,tx_irretutorial_1nff_offer,
+,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
+,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,tx_irretutorial_1nff_offer,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,tx_irretutorial_1nff_offer,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",15,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 1e0c11343042..38cece6d4edc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -9,7 +9,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,512,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,"Hotel #2",297,tt_content,,1
 ,5,89,768,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,89,1,0,1,6,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
@@ -17,7 +17,7 @@ tx_irretutorial_1nff_offer
 ,6,89,1792,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,7,89,768,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1024,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,89,1280,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
 ,11,89,1,0,1,9,0,0,0,0,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
index 5a4544d5fbcc..de58409162be 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
@@ -10,7 +10,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,512,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,"Hotel #2",297,tt_content,,1
 ,5,89,768,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,89,1000000000,1,1,6,0,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,0
 ,9,-1,1000000000,1,1,6,0,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,1
 tx_irretutorial_1nff_offer
@@ -19,7 +19,7 @@ tx_irretutorial_1nff_offer
 ,6,89,1792,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,7,89,768,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1024,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,89,1280,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
 ,11,89,1000000000,1,1,9,0,1,0,0,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 ,12,-1,1000000000,1,1,9,0,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 tx_irretutorial_1nff_price
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
index 7b8b6f33a361..089d46f6f87f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
@@ -7,14 +7,14 @@ tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
 ,3,89,1,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,"Hotel #2",297,tt_content,,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
+,5,90,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,5,0,"Hotel #1",298,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,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,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
+,8,90,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,8,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
@@ -24,5 +24,5 @@ tx_irretutorial_1nff_price
 ,10,89,1,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,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
 ,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
+,13,90,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,13,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 0ea2c99a3c57..4d770a09d6f7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -6,31 +6,31 @@ tt_content
 ,301,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",2
 tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
-,3,90,128,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
-,4,90,64,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
+,3,90,2,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
+,4,90,1,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
+,5,90,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,5,0,"Hotel #1",298,tt_content,,1
 ,8,-1,1,0,0,0,0,0,0,3,0,"Hotel #1",297,tt_content,,2
 ,9,-1,2,0,0,0,0,0,0,4,0,"Hotel #2",297,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
-,5,90,128,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
-,6,90,64,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
-,7,90,32,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
+,5,90,2,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
+,6,90,1,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
+,7,90,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
+,8,90,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,8,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,11,-1,1,0,0,0,0,0,0,5,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,12,-1,2,0,0,0,0,0,0,6,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,13,-1,1,0,0,0,0,0,0,7,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
-,7,90,128,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
-,8,90,64,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
-,9,90,32,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
-,10,90,16,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
-,11,90,8,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
-,12,90,4,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
+,7,90,3,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
+,8,90,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
+,9,90,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
+,10,90,2,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
+,11,90,1,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
+,12,90,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
+,13,90,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,13,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,16,-1,1,0,0,0,0,0,0,7,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
 ,17,-1,2,0,0,0,0,0,0,8,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
index 858d9b3d17ae..80837804970d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
@@ -5,28 +5,28 @@ tt_content
 ,299,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",2
 tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
-,3,89,512,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
-,4,89,256,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
+,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
+,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
 ,5,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,3,0,"Hotel #1",297,tt_content,,2
 ,7,-1,2,0,0,0,0,0,0,4,0,"Hotel #2",297,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
-,5,89,512,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
-,6,89,256,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
-,7,89,128,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
+,5,89,2,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
+,6,89,1,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1280,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,5,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,10,-1,2,0,0,0,0,0,0,6,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,11,-1,1,0,0,0,0,0,0,7,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
-,7,89,512,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
-,8,89,256,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
-,9,89,128,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
-,10,89,64,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
-,11,89,32,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
-,12,89,16,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
+,7,89,3,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
+,9,89,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
+,10,89,2,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
+,11,89,1,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1536,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,7,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
 ,15,-1,2,0,0,0,0,0,0,8,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
index 4f4972a73ea5..e89cec2ef3de 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
@@ -16,7 +16,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,1,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,"Hotel #2",297,tt_content,,1
 ,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,91,768,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,91,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,91,1,0,0,0,0,0,0,0,0,"Hotel #1",301,tt_content,,2
 ,10,91,2,0,0,0,0,0,0,0,0,"Hotel #2",301,tt_content,,1
 tx_irretutorial_1nff_offer
@@ -25,7 +25,7 @@ tx_irretutorial_1nff_offer
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,91,768,0,0,0,0,0,0,0,0,"Offer #1.1",6,tx_irretutorial_1nff_hotel,,1
+,9,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",6,tx_irretutorial_1nff_hotel,,1
 ,11,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",8,tx_irretutorial_1nff_hotel,,3
 ,13,91,2,0,0,0,0,0,0,0,0,"Offer #1.2",8,tx_irretutorial_1nff_hotel,,2
 ,15,91,1,0,0,0,0,0,0,0,0,"Offer #2.1",10,tx_irretutorial_1nff_hotel,,1
@@ -38,10 +38,10 @@ tx_irretutorial_1nff_price
 ,11,89,2,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
-,14,91,1536,0,0,0,0,0,0,0,0,"Price #1.1.1",9,tx_irretutorial_1nff_offer,
-,16,91,768,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
-,18,91,1024,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
-,20,91,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
+,14,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",9,tx_irretutorial_1nff_offer,
+,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
+,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,tx_irretutorial_1nff_offer,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,tx_irretutorial_1nff_offer,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",15,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
index 6921e38755e7..21ea659174b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -25,7 +25,7 @@ tx_irretutorial_1nff_offer
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,91,768,0,0,0,0,0,0,0,0,"Offer #2.1",6,tx_irretutorial_1nff_hotel,,1
+,9,91,1,0,0,0,0,0,0,0,0,"Offer #2.1",6,tx_irretutorial_1nff_hotel,,1
 ,11,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",8,tx_irretutorial_1nff_hotel,,3
 ,13,91,2,0,0,0,0,0,0,0,0,"Offer #1.2",8,tx_irretutorial_1nff_hotel,,2
 ,15,91,1,0,0,0,0,0,0,0,0,"Offer #1.1",10,tx_irretutorial_1nff_hotel,,1
@@ -38,10 +38,10 @@ tx_irretutorial_1nff_price
 ,11,89,2,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,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
-,14,91,1536,0,0,0,0,0,0,0,0,"Price #2.1.1",9,tx_irretutorial_1nff_offer,
-,16,91,768,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
-,18,91,1024,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
-,20,91,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
+,14,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",9,tx_irretutorial_1nff_offer,
+,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,tx_irretutorial_1nff_offer,
+,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,tx_irretutorial_1nff_offer,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,tx_irretutorial_1nff_offer,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,tx_irretutorial_1nff_offer,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,tx_irretutorial_1nff_offer,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",15,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 1e0c11343042..38cece6d4edc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -9,7 +9,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,512,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,"Hotel #2",297,tt_content,,1
 ,5,89,768,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,89,1,0,1,6,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
@@ -17,7 +17,7 @@ tx_irretutorial_1nff_offer
 ,6,89,1792,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,7,89,768,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1024,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,89,1280,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
 ,11,89,1,0,1,9,0,0,0,0,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
index 5a4544d5fbcc..de58409162be 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildrenNDiscardLocalizedParent.csv
@@ -10,7 +10,7 @@ tx_irretutorial_1nff_hotel
 ,3,89,512,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,"Hotel #2",297,tt_content,,1
 ,5,89,768,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
-,6,89,1024,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,tt_content,,1
 ,8,89,1000000000,1,1,6,0,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,0
 ,9,-1,1000000000,1,1,6,0,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,tt_content,,1
 tx_irretutorial_1nff_offer
@@ -19,7 +19,7 @@ tx_irretutorial_1nff_offer
 ,6,89,1792,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,7,89,768,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 ,8,89,1024,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
-,9,89,1280,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,tx_irretutorial_1nff_hotel,,0
 ,11,89,1000000000,1,1,9,0,1,0,0,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 ,12,-1,1000000000,1,1,9,0,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,tx_irretutorial_1nff_hotel,,0
 tx_irretutorial_1nff_price
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
index 7b8b6f33a361..089d46f6f87f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
@@ -7,14 +7,14 @@ tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
 ,3,89,1,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,"Hotel #2",297,tt_content,,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
+,5,90,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,5,0,"Hotel #1",298,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,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,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,6,89,2,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,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
+,8,90,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,8,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
@@ -24,5 +24,5 @@ tx_irretutorial_1nff_price
 ,10,89,1,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,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
 ,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
+,13,90,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,13,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 0ea2c99a3c57..4d770a09d6f7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -6,31 +6,31 @@ tt_content
 ,301,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",2
 tx_irretutorial_1nff_hotel
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,offers
-,3,90,128,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
-,4,90,64,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
+,3,90,2,0,0,0,0,0,0,0,0,"Hotel #1",297,tt_content,,2
+,4,90,1,0,0,0,0,0,0,0,0,"Hotel #2",297,tt_content,,1
+,5,90,1,0,0,0,0,0,0,0,0,"Hotel #1",298,tt_content,,1
 ,6,-1,1,0,0,0,0,0,0,5,0,"Hotel #1",298,tt_content,,1
 ,8,-1,1,0,0,0,0,0,0,3,0,"Hotel #1",297,tt_content,,2
 ,9,-1,2,0,0,0,0,0,0,4,0,"Hotel #2",297,tt_content,,1
 tx_irretutorial_1nff_offer
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier,prices
-,5,90,128,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
-,6,90,64,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
-,7,90,32,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
+,5,90,2,0,0,0,0,0,0,0,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
+,6,90,1,0,0,0,0,0,0,0,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
+,7,90,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
+,8,90,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,9,-1,1,0,0,0,0,0,0,8,0,"Offer #1.1",5,tx_irretutorial_1nff_hotel,,1
 ,11,-1,1,0,0,0,0,0,0,5,0,"Offer #1.1",3,tx_irretutorial_1nff_hotel,,3
 ,12,-1,2,0,0,0,0,0,0,6,0,"Offer #1.2",3,tx_irretutorial_1nff_hotel,,2
 ,13,-1,1,0,0,0,0,0,0,7,0,"Offer #2.1",4,tx_irretutorial_1nff_hotel,,1
 tx_irretutorial_1nff_price
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,parentid,parenttable,parentidentifier
-,7,90,128,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
-,8,90,64,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
-,9,90,32,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
-,10,90,16,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
-,11,90,8,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
-,12,90,4,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
+,7,90,3,0,0,0,0,0,0,0,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
+,8,90,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
+,9,90,1,0,0,0,0,0,0,0,0,"Price #1.1.3",5,tx_irretutorial_1nff_offer,
+,10,90,2,0,0,0,0,0,0,0,0,"Price #1.2.1",6,tx_irretutorial_1nff_offer,
+,11,90,1,0,0,0,0,0,0,0,0,"Price #1.2.2",6,tx_irretutorial_1nff_offer,
+,12,90,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,tx_irretutorial_1nff_offer,
+,13,90,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,14,-1,1,0,0,0,0,0,0,13,0,"Price #1.1.1",8,tx_irretutorial_1nff_offer,
 ,16,-1,1,0,0,0,0,0,0,7,0,"Price #1.1.1",5,tx_irretutorial_1nff_offer,
 ,17,-1,2,0,0,0,0,0,0,8,0,"Price #1.1.2",5,tx_irretutorial_1nff_offer,
-- 
GitLab