From 01c6cdc1b58be4451a07998ccc1b943d04bb6d7a Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 12 Sep 2019 17:10:43 +0200
Subject: [PATCH] [TASK] Keep pid for versioned records
DataHandler does not set "-1" for versioned records in workspaces
anymore, thus making it a lot easier to find the real PID for a versioned
record without always having to fetch the live version for it.
This is ground-breaking, as this opens the door for a lot of improvements
when accessing versions via overlays.
An upgrade wizard will migrate all pid=-1 records to their equivalent
pids, and discard all already published / archived versions.
Resolves: #89555
Releases: master
Change-Id: I31c32451827c1f94764bb0ba22ad8207c8b3d4fd
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/61699
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Manuel Selbach <manuel_selbach@yahoo.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Manuel Selbach <manuel_selbach@yahoo.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
.../Controller/PageLayoutController.php | 11 +-
.../SiteConfigurationController.php | 4 +-
.../DatabasePageLanguageOverlayRows.php | 7 +-
.../Wizard/SuggestWizardDefaultReceiver.php | 4 +-
.../Classes/Tree/View/AbstractTreeView.php | 6 +-
.../Classes/Tree/View/PagePositionMap.php | 4 +-
.../View/BackendLayout/ContentFetcher.php | 4 +-
.../View/Drawing/DrawingConfiguration.php | 6 +-
.../backend/Classes/View/PageLayoutView.php | 10 +-
.../BackendUserAuthentication.php | 4 +-
.../core/Classes/DataHandling/DataHandler.php | 257 ++++++++----------
.../core/Classes/DataHandling/SlugHelper.php | 60 +---
.../Domain/Repository/PageRepository.php | 7 +-
...dDatabaseRecordsContainTheProperPageID.rst | 30 ++
.../Domain/Repository/PageRepositoryTest.php | 13 +-
.../core/Tests/Functional/Fixtures/pages.xml | 2 +-
.../Functional/Fixtures/pages-title-tag.xml | 2 +-
.../Classes/Controller/ExportController.php | 6 +-
.../InfoPageTyposcriptConfigController.php | 4 +-
.../TranslationStatusController.php | 6 +-
.../Updates/DatabaseRowsUpdateWizard.php | 2 +
.../WorkspaceVersionRecordsMigration.php | 93 +++++++
.../Updates/Fixtures/tt_content_versions.csv | 18 ++
.../WorkspaceVersionRecordMigrationTest.php | 123 +++++++++
typo3/sysext/install/ext_localconf.php | 6 +-
.../Controller/RecordListController.php | 4 +-
.../Classes/LinkHandler/PageLinkHandler.php | 5 +-
.../Classes/RecordList/DatabaseRecordList.php | 10 +-
.../Controller/Remote/ActionHandler.php | 8 +-
.../Classes/Hook/DataHandlerHook.php | 34 ++-
.../Classes/Preview/PreviewUriBuilder.php | 4 +-
.../Classes/Service/WorkspaceService.php | 4 -
.../Modify/DataSet/changeContentSorting.csv | 6 +-
.../FAL/Modify/DataSet/copyContent.csv | 6 +-
.../DataSet/createContentWFileReference.csv | 4 +-
.../FAL/Modify/DataSet/deleteContent.csv | 6 +-
.../FAL/Modify/DataSet/localizeContent.csv | 6 +-
.../FAL/Modify/DataSet/modifyContent.csv | 6 +-
.../modifyContentNAddFileReference.csv | 8 +-
.../modifyContentNDeleteAllFileReference.csv | 6 +-
.../modifyContentNDeleteFileReference.csv | 6 +-
.../DataSet/modifyContentWFileReference.csv | 6 +-
.../DataSet/moveContentToDifferentPage.csv | 6 +-
...veContentToDifferentPageNChangeSorting.csv | 12 +-
.../Modify/DataSet/addElementRelation.csv | 2 +-
.../DataSet/changeElementRelationSorting.csv | 2 +-
.../Modify/DataSet/changeElementSorting.csv | 2 +-
.../Modify/DataSet/copyContentOfRelation.csv | 2 +-
.../Modify/DataSet/copyElementOfRelation.csv | 2 +-
.../DataSet/createContentNAddRelation.csv | 2 +-
.../DataSet/createContentNCreateRelation.csv | 4 +-
.../DataSet/deleteContentOfRelation.csv | 2 +-
.../DataSet/deleteElementOfRelation.csv | 2 +-
.../Modify/DataSet/deleteElementRelation.csv | 2 +-
.../DataSet/localizeContentOfRelation.csv | 2 +-
.../DataSet/localizeElementOfRelation.csv | 4 +-
.../DataSet/modifyBothSidesOfRelation.csv | 4 +-
.../DataSet/modifyContentOfRelation.csv | 2 +-
.../DataSet/modifyElementOfRelation.csv | 2 +-
.../moveContentOfRelationToDifferentPage.csv | 2 +-
.../DataSet/changeParentContentSorting.csv | 24 +-
.../IRRE/CSV/Modify/DataSet/copyPage.csv | 34 +--
.../copyPageWHotelBeforeParentContent.csv | 34 +--
.../CSV/Modify/DataSet/copyParentContent.csv | 8 +-
.../copyParentContentToDifferentPage.csv | 8 +-
...NCopyParentContentNHotelNOfferChildren.csv | 12 +-
...otelNOfferChildrenNDiscardCopiedParent.csv | 12 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 12 +-
...alizeParentContentNHotelNOfferChildren.csv | 12 +-
.../Modify/DataSet/createParentContent.csv | 2 +-
...reateParentContentNHotelNOfferChildren.csv | 6 +-
.../IRRE/CSV/Modify/DataSet/deletePage.csv | 2 +-
.../Modify/DataSet/deleteParentContent.csv | 8 +-
.../localizeParentContentWAllChildren.csv | 8 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 28 +-
.../Modify/DataSet/modifyOnlyHotelChild.csv | 6 +-
.../IRRE/CSV/Modify/DataSet/modifyPage.csv | 2 +-
.../Modify/DataSet/modifyParentContent.csv | 8 +-
.../DataSet/modifyParentNAddHotelChild.csv | 10 +-
...odifyParentNChangeHotelChildrenSorting.csv | 24 +-
.../DataSet/modifyParentNDeleteHotelChild.csv | 24 +-
.../DataSet/modifyParentNHotelChild.csv | 24 +-
.../modifyParentNHotelChildNDiscardAll.csv | 24 +-
...arentNHotelChildNDiscardModifiedParent.csv | 24 +-
.../moveParentContentToDifferentPage.csv | 8 +-
...ntContentToDifferentPageNChangeSorting.csv | 32 +--
...otelNOfferChildrenNDiscardCopiedParent.csv | 6 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 6 +-
.../IRRE/CSV/Publish/DataSet/deletePage.csv | 28 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 4 +-
.../DataSet/modifyParentNDeleteHotelChild.csv | 6 +-
.../modifyParentNHotelChildNDiscardAll.csv | 24 +-
...arentNHotelChildNDiscardModifiedParent.csv | 24 +-
...otelNOfferChildrenNDiscardCopiedParent.csv | 6 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 6 +-
.../CSV/PublishAll/DataSet/deletePage.csv | 28 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 4 +-
.../modifyParentNHotelChildNDiscardAll.csv | 4 +-
...arentNHotelChildNDiscardModifiedParent.csv | 2 +-
.../DataSet/changeParentContentSorting.csv | 24 +-
.../ForeignField/Modify/DataSet/copyPage.csv | 36 +--
.../copyPageWHotelBeforeParentContent.csv | 36 +--
.../Modify/DataSet/copyParentContent.csv | 8 +-
.../copyParentContentToDifferentPage.csv | 8 +-
...NCopyParentContentNHotelNOfferChildren.csv | 12 +-
...otelNOfferChildrenNDiscardCopiedParent.csv | 12 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 12 +-
...alizeParentContentNHotelNOfferChildren.csv | 12 +-
...entContentNHotelNOfferChildrenWOSortBy.csv | 12 +-
.../Modify/DataSet/createParentContent.csv | 2 +-
...reateParentContentNHotelNOfferChildren.csv | 6 +-
.../Modify/DataSet/deletePage.csv | 4 +-
.../Modify/DataSet/deleteParentContent.csv | 8 +-
.../localizeParentContentWAllChildren.csv | 8 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 28 +-
.../Modify/DataSet/modifyOnlyHotelChild.csv | 6 +-
.../Modify/DataSet/modifyPage.csv | 4 +-
.../Modify/DataSet/modifyParentContent.csv | 8 +-
.../DataSet/modifyParentNAddHotelChild.csv | 10 +-
...odifyParentNChangeHotelChildrenSorting.csv | 24 +-
.../DataSet/modifyParentNDeleteHotelChild.csv | 24 +-
.../DataSet/modifyParentNHotelChild.csv | 24 +-
.../modifyParentNHotelChildNDiscardAll.csv | 24 +-
...arentNHotelChildNDiscardModifiedParent.csv | 24 +-
.../moveParentContentToDifferentPage.csv | 8 +-
...ntContentToDifferentPageNChangeSorting.csv | 32 +--
...otelNOfferChildrenNDiscardCopiedParent.csv | 6 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 6 +-
.../Publish/DataSet/deletePage.csv | 30 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 4 +-
.../modifyParentNHotelChildNDiscardAll.csv | 24 +-
...arentNHotelChildNDiscardModifiedParent.csv | 24 +-
...otelNOfferChildrenNDiscardCopiedParent.csv | 6 +-
...telNOfferChildrenNDiscardCreatedParent.csv | 12 +-
...tNHotelNOfferChildrenNDiscardLocParent.csv | 6 +-
.../PublishAll/DataSet/deletePage.csv | 30 +-
...modifyNDiscardNModifyParentWHotelChild.csv | 4 +-
.../modifyParentNHotelChildNDiscardAll.csv | 4 +-
...arentNHotelChildNDiscardModifiedParent.csv | 2 +-
.../Modify/DataSet/addCategoryRelation.csv | 2 +-
.../DataSet/changeCategoryRelationSorting.csv | 2 +-
.../Modify/DataSet/copyCategoryOfRelation.csv | 2 +-
.../Modify/DataSet/copyContentOfRelation.csv | 2 +-
.../ManyToMany/Modify/DataSet/copyPage.csv | 6 +-
.../DataSet/createCategoryNAddRelation.csv | 2 +-
.../DataSet/createCategoryNCreateRelation.csv | 4 +-
.../createCategoryWContentNAddRelation.csv | 4 +-
.../DataSet/createContentNAddRelation.csv | 2 +-
.../DataSet/createContentNCreateRelation.csv | 4 +-
.../createContentWCategoryNAddRelation.csv | 4 +-
.../DataSet/deleteCategoryOfRelation.csv | 2 +-
.../Modify/DataSet/deleteCategoryRelation.csv | 2 +-
.../DataSet/deleteContentOfRelation.csv | 2 +-
.../DataSet/localizeCategoryOfRelation.csv | 2 +-
.../DataSet/localizeContentOfRelation.csv | 2 +-
.../Modify/DataSet/modifyBothsOfRelation.csv | 4 +-
.../DataSet/modifyCategoryOfRelation.csv | 2 +-
.../DataSet/modifyContentOfRelation.csv | 2 +-
.../moveContentOfRelationToDifferentPage.csv | 2 +-
.../DataSet/VersionDefaultElements.csv | 2 +-
.../Modify/DataSet/changeContentSorting.csv | 8 +-
.../changeContentSortingAndCopyDraftPage.csv | 26 +-
.../changeContentSortingAndCopyLivePage.csv | 8 +-
.../changeContentSortingNDeleteLiveRecord.csv | 8 +-
...changeContentSortingNDeleteMovedRecord.csv | 8 +-
.../Modify/DataSet/changePageSorting.csv | 4 +-
.../Regular/Modify/DataSet/copyContent.csv | 4 +-
.../Modify/DataSet/copyContentToLanguage.csv | 4 +-
...ontentToLanguageFromNonDefaultLanguage.csv | 4 +-
.../Regular/Modify/DataSet/copyPage.csv | 16 +-
.../Modify/DataSet/copyPageFreeMode.csv | 10 +-
.../DataSet/createContentAndCopyDraftPage.csv | 20 +-
.../DataSet/createContentAndCopyLivePage.csv | 4 +-
.../createContentNDiscardCreatedContent.csv | 4 +-
.../Regular/Modify/DataSet/createContents.csv | 6 +-
...reateNCopyContentNDiscardCopiedContent.csv | 6 +-
...reateNestedPagesAndCopyDraftParentPage.csv | 24 +-
...createNestedPagesAndCopyLiveParentPage.csv | 6 +-
.../Regular/Modify/DataSet/createPage.csv | 2 +-
.../createPageAndCopyDraftParentPage.csv | 20 +-
.../createPageAndCopyLiveParentPage.csv | 4 +-
...tePlaceholdersAndDeleteDraftParentPage.csv | 8 +-
...atePlaceholdersAndDeleteLiveParentPage.csv | 6 +-
.../Regular/Modify/DataSet/deleteContent.csv | 4 +-
.../DataSet/deleteContentAndCopyDraftPage.csv | 16 +-
.../DataSet/deleteContentAndCopyLivePage.csv | 4 +-
.../Modify/DataSet/deleteContentAndPage.csv | 6 +-
.../deleteLocalizedContentNDeleteContent.csv | 6 +-
.../Regular/Modify/DataSet/deletePage.csv | 4 +-
.../Regular/Modify/DataSet/hideContent.csv | 4 +-
.../hideContentAndMoveToDifferentPage.csv | 4 +-
.../Modify/DataSet/localizeContent.csv | 4 +-
.../localizeContentFromNonDefaultLanguage.csv | 4 +-
.../DataSet/localizeContentWHideAtCopy.csv | 4 +-
.../Regular/Modify/DataSet/localizePage.csv | 4 +-
.../Regular/Modify/DataSet/modifyContent.csv | 4 +-
.../Regular/Modify/DataSet/modifyPage.csv | 2 +-
.../DataSet/moveContentAndCopyDraftPage.csv | 20 +-
.../DataSet/moveContentAndCopyLivePage.csv | 6 +-
.../DataSet/moveContentToDifferentPage.csv | 4 +-
.../moveContentToDifferentPageAndHide.csv | 4 +-
...veContentToDifferentPageNChangeSorting.csv | 10 +-
.../DataSet/movePageToDifferentPage.csv | 4 +-
.../movePageToDifferentPageNChangeSorting.csv | 6 +-
...DifferentPageNCreatePageAfterMovedPage.csv | 4 +-
.../Publish/DataSet/changeContentSorting.csv | 6 +-
.../Publish/DataSet/changePageSorting.csv | 2 +-
.../Regular/Publish/DataSet/copyContent.csv | 2 +-
.../Publish/DataSet/copyContentToLanguage.csv | 2 +-
...ontentToLanguageFromNonDefaultLanguage.csv | 2 +-
.../Regular/Publish/DataSet/copyPage.csv | 10 +-
.../Publish/DataSet/copyPageFreeMode.csv | 2 +-
.../createContentNDiscardCreatedContent.csv | 4 +-
.../Publish/DataSet/createContents.csv | 2 +-
...reateNCopyContentNDiscardCopiedContent.csv | 4 +-
...tePlaceholdersAndDeleteDraftParentPage.csv | 13 +-
.../Regular/Publish/DataSet/deleteContent.csv | 2 +-
.../Publish/DataSet/deleteContentAndPage.csv | 11 +-
.../deleteLocalizedContentNDeleteContent.csv | 2 +-
.../Regular/Publish/DataSet/deletePage.csv | 9 +-
.../Publish/DataSet/localizeContent.csv | 2 +-
.../localizeContentFromNonDefaultLanguage.csv | 2 +-
.../Regular/Publish/DataSet/localizePage.csv | 2 +-
.../Regular/Publish/DataSet/modifyContent.csv | 2 +-
.../DataSet/moveContentToDifferentPage.csv | 2 +-
...veContentToDifferentPageNChangeSorting.csv | 6 +-
.../DataSet/movePageToDifferentPage.csv | 2 +-
.../movePageToDifferentPageNChangeSorting.csv | 2 +-
.../DataSet/changeContentSorting.csv | 2 +-
.../PublishAll/DataSet/changePageSorting.csv | 2 +-
.../PublishAll/DataSet/copyContent.csv | 2 +-
.../DataSet/copyContentToLanguage.csv | 2 +-
...ontentToLanguageFromNonDefaultLanguage.csv | 2 +-
.../Regular/PublishAll/DataSet/copyPage.csv | 2 +-
.../PublishAll/DataSet/copyPageFreeMode.csv | 2 +-
.../createContentNDiscardCreatedContent.csv | 4 +-
.../PublishAll/DataSet/createContents.csv | 2 +-
...reateNCopyContentNDiscardCopiedContent.csv | 4 +-
...tePlaceholdersAndDeleteDraftParentPage.csv | 13 +-
...atePlaceholdersAndDeleteLiveParentPage.csv | 6 +-
.../PublishAll/DataSet/deleteContent.csv | 2 +-
.../DataSet/deleteContentAndPage.csv | 11 +-
.../deleteLocalizedContentNDeleteContent.csv | 2 +-
.../Regular/PublishAll/DataSet/deletePage.csv | 9 +-
.../PublishAll/DataSet/localizeContent.csv | 2 +-
.../localizeContentFromNonDefaultLanguage.csv | 2 +-
.../PublishAll/DataSet/localizePage.csv | 2 +-
.../PublishAll/DataSet/modifyContent.csv | 2 +-
.../DataSet/moveContentToDifferentPage.csv | 2 +-
...veContentToDifferentPageNChangeSorting.csv | 2 +-
.../DataSet/movePageToDifferentPage.csv | 2 +-
.../movePageToDifferentPageNChangeSorting.csv | 2 +-
.../Modify/DataSet/addElementRelation.csv | 2 +-
.../DataSet/changeElementRelationSorting.csv | 2 +-
.../Modify/DataSet/changeElementSorting.csv | 2 +-
.../Modify/DataSet/copyContentOfRelation.csv | 2 +-
.../Modify/DataSet/copyElementOfRelation.csv | 2 +-
.../DataSet/createContentNAddRelation.csv | 2 +-
.../DataSet/createContentNCreateRelation.csv | 4 +-
.../DataSet/deleteContentOfRelation.csv | 2 +-
.../DataSet/deleteElementOfRelation.csv | 2 +-
.../Modify/DataSet/deleteElementRelation.csv | 2 +-
.../DataSet/localizeContentOfRelation.csv | 2 +-
.../DataSet/localizeElementOfRelation.csv | 4 +-
.../DataSet/modifyBothSidesOfRelation.csv | 4 +-
.../DataSet/modifyContentOfRelation.csv | 2 +-
.../DataSet/modifyElementOfRelation.csv | 2 +-
.../moveContentOfRelationToDifferentPage.csv | 2 +-
.../WorkspaceServiceTestMovedContent.xml | 8 +-
274 files changed, 1436 insertions(+), 1232 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Important-89555-Workspace-relatedDatabaseRecordsContainTheProperPageID.rst
create mode 100644 typo3/sysext/install/Classes/Updates/RowUpdater/WorkspaceVersionRecordsMigration.php
create mode 100644 typo3/sysext/install/Tests/Functional/Updates/Fixtures/tt_content_versions.csv
create mode 100644 typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceVersionRecordMigrationTest.php
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 46ee8c0b07c3..e391dbd1d79d 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -27,8 +27,8 @@ use TYPO3\CMS\Backend\View\PageLayoutView;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Configuration\Features;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
use TYPO3\CMS\Core\Http\HtmlResponse;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -229,7 +229,7 @@ class PageLayoutController
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$statement = $queryBuilder->select('uid', $GLOBALS['TCA']['pages']['ctrl']['languageField'])
->from('pages')
->where(
@@ -496,7 +496,7 @@ class PageLayoutController
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$localizedPage = $queryBuilder
->select('*')
->from('pages')
@@ -794,7 +794,7 @@ class PageLayoutController
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$overlayRecord = $queryBuilder
->select('uid')
->from('pages')
@@ -811,6 +811,7 @@ class PageLayoutController
->setMaxResults(1)
->execute()
->fetch();
+ BackendUtility::workspaceOL('pages', $overlayRecord, (int)$this->getBackendUser()->workspace);
// Edit button
$urlParameters = [
'edit' => [
@@ -865,7 +866,7 @@ class PageLayoutController
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$queryBuilder
->count('uid')
diff --git a/typo3/sysext/backend/Classes/Controller/SiteConfigurationController.php b/typo3/sysext/backend/Classes/Controller/SiteConfigurationController.php
index a8b1b35f1e56..29aad1a9d71e 100644
--- a/typo3/sysext/backend/Classes/Controller/SiteConfigurationController.php
+++ b/typo3/sysext/backend/Classes/Controller/SiteConfigurationController.php
@@ -31,8 +31,8 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Configuration\SiteConfiguration;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
use TYPO3\CMS\Core\Http\HtmlResponse;
@@ -633,7 +633,7 @@ class SiteConfigurationController
{
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeByType(HiddenRestriction::class);
- $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, 0, false));
+ $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
$statement = $queryBuilder
->select('*')
->from('pages')
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabasePageLanguageOverlayRows.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabasePageLanguageOverlayRows.php
index ec23b5759b46..0fe34109cfbe 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabasePageLanguageOverlayRows.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabasePageLanguageOverlayRows.php
@@ -15,9 +15,10 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
*/
use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Context\Context;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
@@ -51,12 +52,14 @@ class DatabasePageLanguageOverlayRows implements FormDataProviderInterface
*/
protected function getDatabaseRows(int $pid): array
{
+ $context = GeneralUtility::makeInstance(Context::class);
+ $workspaceId = $context->getPropertyFromAspect('workspace', 'id');
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$workspaceId));
$rows = $queryBuilder->select('*')
->from('pages')
diff --git a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
index a3e71c7295fa..904263fe5069 100644
--- a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -102,7 +102,7 @@ class SuggestWizardDefaultReceiver
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
// if table is versionized, only get the records from the Live Workspace
// the overlay itself of WS-records is done below
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, 0));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
$this->table = $table;
$this->config = $config;
// get a list of all the pages that should be looked on
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 328a2104526e..0ad6f6fa1b0d 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -813,7 +813,7 @@ abstract class AbstractTreeView
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$count = $queryBuilder
->count('uid')
->from($this->table)
@@ -869,7 +869,7 @@ abstract class AbstractTreeView
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$queryBuilder
->select(...$this->fieldArray)
->from($this->table)
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index 311b69352f60..6b29119dff31 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -19,10 +19,10 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\BackendLayoutView;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\EndTimeRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\StartTimeRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -361,7 +361,7 @@ class PagePositionMap
$lines = [];
foreach ($colPosArray as $kk => $vv) {
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
- $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
if ($showHidden) {
$queryBuilder->getRestrictions()
->removeByType(HiddenRestriction::class)
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php b/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
index dbfa11533512..339e963edaa3 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
@@ -21,8 +21,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\PageLayoutView;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
@@ -198,7 +198,7 @@ class ContentFetcher
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$GLOBALS['BE_USER']->workspace));
$queryBuilder
->select(...$fields)
->from('tt_content');
diff --git a/typo3/sysext/backend/Classes/View/Drawing/DrawingConfiguration.php b/typo3/sysext/backend/Classes/View/Drawing/DrawingConfiguration.php
index d316ac030fe7..f0dcbf4f297c 100644
--- a/typo3/sysext/backend/Classes/View/Drawing/DrawingConfiguration.php
+++ b/typo3/sysext/backend/Classes/View/Drawing/DrawingConfiguration.php
@@ -20,8 +20,8 @@ use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Site\Entity\NullSite;
@@ -241,7 +241,7 @@ class DrawingConfiguration
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$localizedPage = $queryBuilder
->select('*')
->from('pages')
@@ -293,7 +293,7 @@ class DrawingConfiguration
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$queryBuilder->select('uid', $GLOBALS['TCA']['pages']['ctrl']['languageField'])
->from('pages')
->where(
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index 960afcb51cc1..21154172c29f 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -31,8 +31,8 @@ use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Database\ReferenceIndex;
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -1418,7 +1418,7 @@ class PageLayoutView implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, null, false));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
$queryBuilder
->select('*')
->from('tt_content')
@@ -1567,7 +1567,7 @@ class PageLayoutView implements LoggerAwareInterface
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$queryBuilder->select('uid', $GLOBALS['TCA']['pages']['ctrl']['languageField'])
->from('pages')
->where(
@@ -1883,7 +1883,7 @@ class PageLayoutView implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$queryBuilder
->select(...$fields)
->from($table);
@@ -1993,7 +1993,7 @@ class PageLayoutView implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$localizedPage = $queryBuilder
->select('*')
->from('pages')
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index ec15308b8abe..782146508a41 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -24,10 +24,10 @@ use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\RootLevelRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
use TYPO3\CMS\Core\Mail\FluidEmail;
use TYPO3\CMS\Core\Mail\Mailer;
@@ -760,7 +760,7 @@ class BackendUserAuthentication extends AbstractUserAuthentication
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->workspace));
$recordLocalizations = $queryBuilder->select('*')
->from($table)
->where(
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 108ed64566bc..c52c28d78e7d 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -938,35 +938,28 @@ class DataHandler implements LoggerAwareInterface
}
}
$theRealPid = $fieldArray['pid'];
- // Now, check if we may insert records on this pid.
- if ($theRealPid >= 0) {
- // Checks if records can be inserted on this $pid.
- // If this is a page translation, the check needs to be done for the l10n_parent record
- if ($table === 'pages' && $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['languageField']] > 0 && $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] > 0) {
- $recordAccess = $this->checkRecordInsertAccess($table, $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']]);
- } else {
- $recordAccess = $this->checkRecordInsertAccess($table, $theRealPid);
- }
- if ($recordAccess) {
- $this->addDefaultPermittedLanguageIfNotSet($table, $incomingFieldArray);
- $recordAccess = $this->BE_USER->recordEditAccessInternals($table, $incomingFieldArray, true);
- if (!$recordAccess) {
- $this->newlog('recordEditAccessInternals() check failed. [' . $this->BE_USER->errorMsg . ']', SystemLogErrorClassification::USER_ERROR);
- } elseif (!$this->bypassWorkspaceRestrictions) {
- // Workspace related processing:
- // If LIVE records cannot be created due to workspace restrictions, prepare creation of placeholder-record
- if (!$this->BE_USER->workspaceAllowsLiveEditingInTable($table)) {
- if (BackendUtility::isTableWorkspaceEnabled($table)) {
- $createNewVersion = true;
- } else {
- $recordAccess = false;
- $this->newlog('Record could not be created in this workspace in this branch', SystemLogErrorClassification::USER_ERROR);
- }
- }
+ // Checks if records can be inserted on this $pid.
+ // If this is a page translation, the check needs to be done for the l10n_parent record
+ if ($table === 'pages' && $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['languageField']] > 0 && $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] > 0) {
+ $recordAccess = $this->checkRecordInsertAccess($table, $incomingFieldArray[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']]);
+ } else {
+ $recordAccess = $this->checkRecordInsertAccess($table, $theRealPid);
+ }
+ if ($recordAccess) {
+ $this->addDefaultPermittedLanguageIfNotSet($table, $incomingFieldArray);
+ $recordAccess = $this->BE_USER->recordEditAccessInternals($table, $incomingFieldArray, true);
+ if (!$recordAccess) {
+ $this->newlog('recordEditAccessInternals() check failed. [' . $this->BE_USER->errorMsg . ']', SystemLogErrorClassification::USER_ERROR);
+ } elseif (!$this->bypassWorkspaceRestrictions && !$this->BE_USER->workspaceAllowsLiveEditingInTable($table)) {
+ // If LIVE records cannot be created due to workspace restrictions, prepare creation of placeholder-record
+ // So, if no live records were allowed in the current workspace, we have to create a new version of this record
+ if (BackendUtility::isTableWorkspaceEnabled($table)) {
+ $createNewVersion = true;
+ } else {
+ $recordAccess = false;
+ $this->newlog('Record could not be created in this workspace', SystemLogErrorClassification::USER_ERROR);
}
}
- } else {
- $this->logger->debug('Internal ERROR: pid should not be less than zero!');
}
// Yes new record, change $record_status to 'insert'
$status = 'new';
@@ -1133,8 +1126,8 @@ class DataHandler implements LoggerAwareInterface
$newVersion_placeholderFieldArray[$GLOBALS['TCA'][$table]['ctrl']['label']] = $this->getPlaceholderTitleForTableLabel($table);
// Saving placeholder as 'original'
$this->insertDB($table, $id, $newVersion_placeholderFieldArray, false, (int)($incomingFieldArray['uid'] ?? 0));
- // For the actual new offline version, set versioning values to point to placeholder:
- $fieldArray['pid'] = -1;
+ // For the actual new offline version, set versioning values to point to placeholder
+ $fieldArray['pid'] = $theRealPid;
$fieldArray['t3ver_oid'] = $this->substNEWwithIDs[$id];
// Setting placeholder state value for version (so it can know it is currently a new version...)
$fieldArray['t3ver_state'] = (string)new VersionState(VersionState::NEW_PLACEHOLDER_VERSION);
@@ -1485,7 +1478,7 @@ class DataHandler implements LoggerAwareInterface
* @param string $value Value to be evaluated. Notice, this is the INPUT value from the form. The original value (from any existing record) must be manually looked up inside the function if needed - or taken from $currentRecord array.
* @param string $id The record-uid, mainly - but not exclusively - used for logging
* @param string $status 'update' or 'new' flag
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param int $tscPID TSconfig PID
* @param array $incomingFieldArray the fields being explicitly set by the outside (unlike $fieldArray)
* @return array Returns the evaluated $value as key "value" in this array. Can be checked with isset($res['value']) ...
@@ -1609,7 +1602,7 @@ class DataHandler implements LoggerAwareInterface
* @param int $id UID of record
* @param mixed $curValue Current value of the field
* @param string $status 'update' or 'new' flag
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $recFID Field identifier [table:uid:field] for flexforms
* @param string $field Field name. Must NOT be set if the call is for a flexform field (since flexforms are not allowed within flexforms).
* @param array $uploadedFiles
@@ -1724,7 +1717,7 @@ class DataHandler implements LoggerAwareInterface
* @param array $tcaFieldConf Field configuration from TCA
* @param string $table Table name
* @param int $id UID of record
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $field Field name
* @return array $res The result array. The processed value (if any!) is set in the "value" key.
*/
@@ -1764,7 +1757,7 @@ class DataHandler implements LoggerAwareInterface
* @param array $tcaFieldConf Field configuration from TCA
* @param string $table Table name
* @param int $id UID of record
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $field Field name
* @return array $res The result array. The processed value (if any!) is set in the "value" key.
*/
@@ -1814,8 +1807,8 @@ class DataHandler implements LoggerAwareInterface
}
// Process UNIQUE settings:
- // Field is NOT set for flexForms - which also means that uniqueInPid and unique is NOT available for flexForm fields! Also getUnique should not be done for versioning and if PID is -1 ($realPid<0) then versioning is happening...
- if ($field && $realPid >= 0 && !empty($res['value'])) {
+ // Field is NOT set for flexForms - which also means that uniqueInPid and unique is NOT available for flexForm fields! Also getUnique should not be done for versioning
+ if ($field && !empty($res['value'])) {
if (in_array('uniqueInPid', $evalCodesArray, true)) {
$res['value'] = $this->getUnique($table, $field, $res['value'], $id, $realPid);
}
@@ -1855,7 +1848,7 @@ class DataHandler implements LoggerAwareInterface
* @param array $tcaFieldConf Field configuration from TCA
* @param string $table Table name
* @param int $id UID of record
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $field Field name
* @param array $incomingFieldArray the fields being explicitly set by the outside (unlike $fieldArray) for the record
* @return array $res The result array. The processed value (if any!) is set in the "value" key.
@@ -1874,17 +1867,6 @@ class DataHandler implements LoggerAwareInterface
$value = $helper->sanitize($value);
}
- // In case a workspace is given, and the $realPid(!) still is negative
- // this is most probably triggered by versionizeRecord() and a raw record
- // copy - thus, uniqueness cannot be determined without having the
- // real information
- // @todo This is still not explicit, but probably should be
- if ($workspaceId > 0 && $realPid === -1
- && !MathUtility::canBeInterpretedAsInteger($id)
- ) {
- return ['value' => $value];
- }
-
// Return directly in case no evaluations are defined
if (empty($tcaFieldConf['eval'])) {
return ['value' => $value];
@@ -1911,7 +1893,7 @@ class DataHandler implements LoggerAwareInterface
* @param array $tcaFieldConf Field configuration from TCA
* @param string $table Table name
* @param int $id UID of record
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $field Field name
* @return array Modified $res array
*/
@@ -1951,7 +1933,7 @@ class DataHandler implements LoggerAwareInterface
// @todo: error message to the user - dynamic item sets via itemProcFunc on check would be a bad idea anyway.
$value = $value & $maxV;
}
- if ($field && $realPid >= 0 && $value > 0 && !empty($tcaFieldConf['eval'])) {
+ if ($field && $value > 0 && !empty($tcaFieldConf['eval'])) {
$evalCodesArray = GeneralUtility::trimExplode(',', $tcaFieldConf['eval'], true);
$otherRecordsWithSameValue = [];
$maxCheckedRecords = 0;
@@ -2145,7 +2127,7 @@ class DataHandler implements LoggerAwareInterface
* @param int $id UID of record
* @param mixed $curValue Current value of the field
* @param string $status 'update' or 'new' flag
- * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+ * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
* @param string $recFID Field identifier [table:uid:field] for flexforms
* @param int $tscPID TSconfig PID
* @param array $uploadedFiles Uploaded files for the field
@@ -2371,6 +2353,7 @@ class DataHandler implements LoggerAwareInterface
* @param int $id UID to filter out in the lookup (the record itself...)
* @param int $newPid If set, the value will be unique for this PID
* @return string Modified value (if not-unique). Will be the value appended with a number (until 100, then the function just breaks).
+ * @todo: consider workspaces, especially when publishing a unique value which has a unique value already in live
*/
public function getUnique($table, $field, $value, $id, $newPid = 0)
{
@@ -2493,7 +2476,7 @@ class DataHandler implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$queryBuilder->select('*')
->from($tableName)
@@ -2512,10 +2495,6 @@ class DataHandler implements LoggerAwareInterface
$queryBuilder->andWhere(
$queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pageId, \PDO::PARAM_INT))
);
- } else {
- $queryBuilder->andWhere(
- $queryBuilder->expr()->gte('pid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
- );
}
$result = $queryBuilder->execute()->fetchAll();
@@ -3200,7 +3179,7 @@ class DataHandler implements LoggerAwareInterface
}
// Check if table is allowed on destination page
- if ($destPid >= 0 && !$this->isTableAllowedForThisPage($destPid, $table)) {
+ if (!$this->isTableAllowedForThisPage($destPid, $table)) {
$this->log($table, $uid, SystemLogDatabaseAction::INSERT, 0, SystemLogErrorClassification::USER_ERROR, 'Attempt to insert record "%s:%s" on a page (%s) that can\'t store record type.', -1, [$table, $uid, $destPid]);
return null;
}
@@ -3214,7 +3193,7 @@ class DataHandler implements LoggerAwareInterface
$data = [];
$nonFields = array_unique(GeneralUtility::trimExplode(',', 'uid,perms_userid,perms_groupid,perms_user,perms_group,perms_everybody,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_count,t3ver_stage,t3ver_tstamp,' . $excludeFields, true));
- BackendUtility::workspaceOL($table, $row, -99, false);
+ BackendUtility::workspaceOL($table, $row, $this->BE_USER->workspace);
$row = BackendUtility::purgeComputedPropertiesFromRecord($row);
// Initializing:
@@ -3401,6 +3380,7 @@ class DataHandler implements LoggerAwareInterface
$isTableWorkspaceEnabled = BackendUtility::isTableWorkspaceEnabled($table);
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
$this->addDeleteRestriction($queryBuilder->getRestrictions()->removeAll());
+ $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$queryBuilder
->select(...$fields)
->from($table)
@@ -3410,24 +3390,6 @@ class DataHandler implements LoggerAwareInterface
$queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
)
);
- if ($isTableWorkspaceEnabled && (int)$this->BE_USER->workspace === 0) {
- // Table is workspace enabled, user is in default ws -> add t3ver_wsid=0 restriction
- $queryBuilder->andWhere(
- $queryBuilder->expr()->eq(
- 't3ver_wsid',
- $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
- )
- );
- } elseif ($isTableWorkspaceEnabled) {
- // Table is workspace enabled, user has a ws selected -> select wsid=0 and selected wsid rows
- $queryBuilder->andWhere($queryBuilder->expr()->in(
- 't3ver_wsid',
- $queryBuilder->createNamedParameter(
- [0, $this->BE_USER->workspace],
- Connection::PARAM_INT_ARRAY
- )
- ));
- }
if (!empty($GLOBALS['TCA'][$table]['ctrl']['sortby'])) {
$queryBuilder->orderBy($GLOBALS['TCA'][$table]['ctrl']['sortby'], 'DESC');
}
@@ -3549,7 +3511,6 @@ class DataHandler implements LoggerAwareInterface
$row[$field] = $value;
}
}
- // Force versioning related fields:
$row['pid'] = $pid;
// Setting original UID:
if ($GLOBALS['TCA'][$table]['ctrl']['origUid']) {
@@ -3571,7 +3532,7 @@ class DataHandler implements LoggerAwareInterface
*
* @param string $table Table name
* @param array $fieldArray Field array to insert as a record
- * @param int $realPid The value of PID field. -1 is indication that we are creating a new version!
+ * @param int $realPid The value of PID field.
* @return int Returns the new ID of the record (if applicable)
*/
public function insertNewCopyVersion($table, $fieldArray, $realPid)
@@ -3843,7 +3804,7 @@ class DataHandler implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$queryBuilder->select('*')
->from($table)
@@ -3854,11 +3815,6 @@ class DataHandler implements LoggerAwareInterface
)
);
- if (BackendUtility::isTableWorkspaceEnabled($table)) {
- $queryBuilder->andWhere(
- $queryBuilder->expr()->eq('t3ver_oid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
- );
- }
// If $destPid is < 0, get the pid of the record with uid equal to abs($destPid)
$tscPID = BackendUtility::getTSconfig_pidValue($table, $uid, $destPid);
// Get the localized records to be copied
@@ -4033,8 +3989,9 @@ class DataHandler implements LoggerAwareInterface
$origDestPid = $destPid;
// This is the actual pid of the moving to destination
$resolvedPid = $this->resolvePid($table, $destPid);
- // Checking if the pid is negative, but no sorting row is defined. In that case, find the correct pid. Basically this check make the error message 4-13 meaning less... But you can always remove this check if you prefer the error instead of a no-good action (which is to move the record to its own page...)
- // $destPid>=0 because we must correct pid in case of versioning "page" types.
+ // Checking if the pid is negative, but no sorting row is defined. In that case, find the correct pid.
+ // Basically this check make the error message 4-13 meaning less... But you can always remove this check if you
+ // prefer the error instead of a no-good action (which is to move the record to its own page...)
if (($destPid < 0 && !$sortColumn) || $destPid >= 0) {
$destPid = $resolvedPid;
}
@@ -5156,7 +5113,7 @@ class DataHandler implements LoggerAwareInterface
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->BE_USER->workspace));
$queryBuilder->select('*')
->from($table)
@@ -5167,18 +5124,12 @@ class DataHandler implements LoggerAwareInterface
)
);
- if (BackendUtility::isTableWorkspaceEnabled($table)) {
- $queryBuilder->andWhere(
- $queryBuilder->expr()->eq('t3ver_oid', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
- );
- }
-
$result = $queryBuilder->execute();
while ($record = $result->fetch()) {
// Ignore workspace delete placeholders. Those records have been marked for
// deletion before - deleting them again in a workspace would revert that state.
- if ($this->BE_USER->workspace > 0 && BackendUtility::isTableWorkspaceEnabled($table)) {
- BackendUtility::workspaceOL($table, $record);
+ if ((int)$this->BE_USER->workspace > 0 && BackendUtility::isTableWorkspaceEnabled($table)) {
+ BackendUtility::workspaceOL($table, $record, $this->BE_USER->workspace);
if (VersionState::cast($record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) {
continue;
}
@@ -5223,7 +5174,7 @@ class DataHandler implements LoggerAwareInterface
if ($row === false) {
$this->newlog(
'The record does not exist or you don\'t have correct permissions to make a new version (copy) of this record "' . $table . ':' . $id . '"',
- 1
+ SystemLogErrorClassification::USER_ERROR
);
return null;
}
@@ -5274,7 +5225,7 @@ class DataHandler implements LoggerAwareInterface
'delete' => $delete,
'label' => $label,
];
- return $this->copyRecord_raw($table, $id, -1, $overrideArray, $workspaceOptions);
+ return $this->copyRecord_raw($table, $id, (int)$row['pid'], $overrideArray, $workspaceOptions);
}
// Reuse the existing record and return its uid
// (prior to TYPO3 CMS 6.2, an error was thrown here, which
@@ -5606,11 +5557,13 @@ class DataHandler implements LoggerAwareInterface
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->start($value, $conf['foreign_table'], '', 0, $table, $conf);
- // Keep original (live) item array and update values for specific versioned records
- $originalItemArray = $dbAnalysis->itemArray;
+ $updatePidForRecords = [];
+ // Update values for specific versioned records
foreach ($dbAnalysis->itemArray as &$item) {
+ $updatePidForRecords[$item['table']][] = $item['id'];
$versionedId = $this->getAutoVersionId($item['table'], $item['id']);
if (!empty($versionedId)) {
+ $updatePidForRecords[$item['table']][] = $versionedId;
$item['id'] = $versionedId;
}
}
@@ -5628,21 +5581,26 @@ class DataHandler implements LoggerAwareInterface
$thePidToUpdate = $this->copyMappingArray_merged['pages'][$thePidToUpdate];
}
- // Update child records if change to pid is required (only if the current record is not on a workspace):
- if ($thePidToUpdate) {
+ // Update child records if change to pid is required
+ if ($thePidToUpdate && !empty($updatePidForRecords)) {
// Ensure that only the default language page is used as PID
$thePidToUpdate = $this->getDefaultLanguagePageId($thePidToUpdate);
+ // @todo: this can probably go away
// ensure, only live page ids are used as 'pid' values
$liveId = BackendUtility::getLiveVersionIdOfRecord('pages', $theUidToUpdate);
if ($liveId !== null) {
$thePidToUpdate = $liveId;
}
$updateValues = ['pid' => $thePidToUpdate];
- foreach ($originalItemArray as $v) {
- if ($v['id'] && $v['table'] && BackendUtility::getLiveVersionIdOfRecord($v['table'], $v['id']) === null) {
- GeneralUtility::makeInstance(ConnectionPool::class)
- ->getConnectionForTable($v['table'])
- ->update($v['table'], $updateValues, ['uid' => (int)$v['id']]);
+ foreach ($updatePidForRecords as $tableName => $uids) {
+ $uids = array_map('trim', $uids);
+ if (empty($tableName) || empty($uids)) {
+ continue;
+ }
+ $conn = GeneralUtility::makeInstance(ConnectionPool::class)
+ ->getConnectionForTable($tableName);
+ foreach ($uids as $uid) {
+ $conn->update($tableName, $updateValues, ['uid' => (int)$uid]);
}
}
}
@@ -6202,30 +6160,28 @@ class DataHandler implements LoggerAwareInterface
{
$pid = (int)$pid;
$perms = (int)$perms;
- if ($pid >= 0) {
- $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
- $this->addDeleteRestriction($queryBuilder->getRestrictions()->removeAll());
- $result = $queryBuilder
- ->select('uid', 'perms_userid', 'perms_groupid', 'perms_user', 'perms_group', 'perms_everybody')
- ->from('pages')
- ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)))
- ->orderBy('sorting')
- ->execute();
- while ($row = $result->fetch()) {
- // IF admin, then it's OK
- if ($this->admin || $this->BE_USER->doesUserHaveAccess($row, $perms)) {
- $inList .= $row['uid'] . ',';
- if ($recurse) {
- // Follow the subpages recursively...
- $inList = $this->doesBranchExist($inList, $row['uid'], $perms, $recurse);
- if ($inList === -1) {
- return -1;
- }
+ $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
+ $this->addDeleteRestriction($queryBuilder->getRestrictions()->removeAll());
+ $result = $queryBuilder
+ ->select('uid', 'perms_userid', 'perms_groupid', 'perms_user', 'perms_group', 'perms_everybody')
+ ->from('pages')
+ ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)))
+ ->orderBy('sorting')
+ ->execute();
+ while ($row = $result->fetch()) {
+ // IF admin, then it's OK
+ if ($this->admin || $this->BE_USER->doesUserHaveAccess($row, $perms)) {
+ $inList .= $row['uid'] . ',';
+ if ($recurse) {
+ // Follow the subpages recursively...
+ $inList = $this->doesBranchExist($inList, $row['uid'], $perms, $recurse);
+ if ($inList === -1) {
+ return -1;
}
- } else {
- // No permissions
- return -1;
}
+ } else {
+ // No permissions
+ return -1;
}
}
return $inList;
@@ -6901,10 +6857,10 @@ class DataHandler implements LoggerAwareInterface
return null;
}
+ $considerWorkspaces = BackendUtility::isTableWorkspaceEnabled($table);
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
$queryBuilder = $connectionPool->getQueryBuilderForTable($table);
$this->addDeleteRestriction($queryBuilder->getRestrictions()->removeAll());
- $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->BE_USER->workspace));
$queryBuilder
->select($sortColumn, 'pid', 'uid')
@@ -6913,8 +6869,15 @@ class DataHandler implements LoggerAwareInterface
// find and return the sorting value for the first record on that pid
if ($pid >= 0) {
// Fetches the first record (lowest sorting) under this pid
+ $queryBuilder
+ ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)));
+
+ if ($considerWorkspaces) {
+ $queryBuilder->andWhere(
+ $queryBuilder->expr()->eq('t3ver_oid', 0)
+ );
+ }
$row = $queryBuilder
- ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)))
->orderBy($sortColumn, 'ASC')
->addOrderBy('uid', 'ASC')
->setMaxResults(1)
@@ -6967,9 +6930,8 @@ class DataHandler implements LoggerAwareInterface
} else {
$queryBuilder = $connectionPool->getQueryBuilderForTable($table);
$this->addDeleteRestriction($queryBuilder->getRestrictions()->removeAll());
- $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->BE_USER->workspace));
- $subResults = $queryBuilder
+ $queryBuilder
->select($sortColumn, 'pid', 'uid')
->from($table)
->where(
@@ -6984,9 +6946,17 @@ class DataHandler implements LoggerAwareInterface
)
->orderBy($sortColumn, 'ASC')
->addOrderBy('uid', 'DESC')
- ->setMaxResults(2)
- ->execute()
- ->fetchAll();
+ ->setMaxResults(2);
+
+ if ($considerWorkspaces) {
+ $queryBuilder->andWhere(
+ $queryBuilder->expr()->eq('t3ver_oid', 0)
+ );
+ }
+
+ $subResults = $queryBuilder
+ ->execute()
+ ->fetchAll();
// Fetches the next record in order to calculate the in-between sortNumber
// There was a record afterwards
if (count($subResults) === 2) {
@@ -7038,6 +7008,12 @@ class DataHandler implements LoggerAwareInterface
if ($sortingValue !== null) {
$queryBuilder->andWhere($queryBuilder->expr()->gt($sortBy, $sortingValue));
}
+ if (BackendUtility::isTableWorkspaceEnabled($table)) {
+ $queryBuilder
+ ->andWhere(
+ $queryBuilder->expr()->eq('t3ver_oid', 0)
+ );
+ }
$deleteColumn = $GLOBALS['TCA'][$table]['ctrl']['delete'] ?? '';
if ($deleteColumn) {
@@ -7784,10 +7760,6 @@ class DataHandler implements LoggerAwareInterface
->where($query->expr()->eq('uid', $query->createNamedParameter(abs($pid), \PDO::PARAM_INT)))
->execute()
->fetch();
- // Look, if the record UID happens to be an offline record. If so, find its live version.
- if ($lookForLiveVersion = BackendUtility::getLiveVersionOfRecord($table, abs($pid), 'pid')) {
- $row = $lookForLiveVersion;
- }
$pid = (int)$row['pid'];
}
return $pid;
@@ -7949,7 +7921,7 @@ class DataHandler implements LoggerAwareInterface
$pageUid = 0;
// Get Page TSconfig relevant:
$TSConfig = BackendUtility::getPagesTSconfig($pid)['TCEMAIN.'] ?? [];
- if (empty($TSConfig['clearCache_disable'])) {
+ if (empty($TSConfig['clearCache_disable']) && $this->BE_USER->workspace === 0) {
$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
// If table is "pages":
$pageIdsThatNeedCacheFlush = [];
@@ -8050,12 +8022,7 @@ class DataHandler implements LoggerAwareInterface
}
// Delete cache for selected pages:
foreach ($pageIdsThatNeedCacheFlush as $pageId) {
- // Workspaces always use "-1" as the page id which do not
- // point to real pages and caches at all. Flushing caches for
- // those records does not make sense and decreases performance
- if ($pageId >= 0) {
- $tagsToClear['pageId_' . $pageId] = true;
- }
+ $tagsToClear['pageId_' . $pageId] = true;
}
// Queue delete cache for current table and record
$tagsToClear[$table] = true;
diff --git a/typo3/sysext/core/Classes/DataHandling/SlugHelper.php b/typo3/sysext/core/Classes/DataHandling/SlugHelper.php
index 8188e26dd55e..dfee48bb858a 100644
--- a/typo3/sysext/core/Classes/DataHandling/SlugHelper.php
+++ b/typo3/sysext/core/Classes/DataHandling/SlugHelper.php
@@ -244,16 +244,12 @@ class SlugHelper
$recordId = $state->getSubject()->getIdentifier();
$languageId = $state->getContext()->getLanguageId();
- if ($pageId < 0) {
- $pageId = $this->resolveLivePageId($recordId);
- }
-
$queryBuilder = $this->createPreparedQueryBuilder();
$this->applySlugConstraint($queryBuilder, $slug);
$this->applyPageIdConstraint($queryBuilder, $pageId);
$this->applyRecordConstraint($queryBuilder, $recordId);
$this->applyLanguageConstraint($queryBuilder, $languageId);
- $this->applyWorkspaceConstraint($queryBuilder);
+ $this->applyWorkspaceConstraint($queryBuilder, $state);
$statement = $queryBuilder->execute();
$records = $this->resolveVersionOverlays(
@@ -282,15 +278,11 @@ class SlugHelper
}
$pageId = (int)$pageId;
- if ($pageId < 0) {
- $pageId = $this->resolveLivePageId($recordId);
- }
-
$queryBuilder = $this->createPreparedQueryBuilder();
$this->applySlugConstraint($queryBuilder, $slug);
$this->applyRecordConstraint($queryBuilder, $recordId);
$this->applyLanguageConstraint($queryBuilder, $languageId);
- $this->applyWorkspaceConstraint($queryBuilder);
+ $this->applyWorkspaceConstraint($queryBuilder, $state);
$statement = $queryBuilder->execute();
$records = $this->resolveVersionOverlays(
@@ -401,6 +393,7 @@ class SlugHelper
$fieldNames = ['uid', 'pid', $this->fieldName];
if ($this->workspaceEnabled) {
$fieldNames[] = 't3ver_state';
+ $fieldNames[] = 't3ver_oid';
}
$languageFieldName = $GLOBALS['TCA'][$this->tableName]['ctrl']['languageField'] ?? null;
if (is_string($languageFieldName)) {
@@ -423,8 +416,9 @@ class SlugHelper
/**
* @param QueryBuilder $queryBuilder
+ * @param RecordState $state
*/
- protected function applyWorkspaceConstraint(QueryBuilder $queryBuilder)
+ protected function applyWorkspaceConstraint(QueryBuilder $queryBuilder, RecordState $state)
{
if (!$this->workspaceEnabled) {
return;
@@ -433,6 +427,13 @@ class SlugHelper
$queryBuilder->getRestrictions()->add(
GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->workspaceId)
);
+
+ // Exclude the online record of a versioned record
+ if ($state->getVersionLink()) {
+ $queryBuilder->andWhere(
+ $queryBuilder->expr()->neq('uid', $state->getVersionLink()->getSubject()->getIdentifier())
+ );
+ }
}
/**
@@ -515,43 +516,6 @@ class SlugHelper
}
}
- /**
- * @param int $recordId
- * @return int
- * @throws \RuntimeException
- */
- protected function resolveLivePageId($recordId): int
- {
- if (!MathUtility::canBeInterpretedAsInteger($recordId)) {
- throw new \RuntimeException(
- sprintf(
- 'Cannot resolve live page id for non-numeric identifier "%s"',
- $recordId
- ),
- 1534951024
- );
- }
-
- $liveVersion = BackendUtility::getLiveVersionOfRecord(
- $this->tableName,
- $recordId,
- 'pid'
- );
-
- if (empty($liveVersion)) {
- throw new \RuntimeException(
- sprintf(
- 'Cannot resolve live page id for record "%s:%d"',
- $this->tableName,
- $recordId
- ),
- 1534951025
- );
- }
-
- return (int)$liveVersion['pid'];
- }
-
/**
* @param array $records
* @return array
diff --git a/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php b/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
index ebfed28eb1f8..699974a6ed91 100644
--- a/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
+++ b/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
@@ -1279,6 +1279,7 @@ class PageRepository implements LoggerAwareInterface
$constraints[] = $expressionBuilder->eq($table . '.' . $ctrl['delete'], 0);
}
if ($this->hasTableWorkspaceSupport($table)) {
+ // this should work exactly as WorkspaceRestriction and WorkspaceRestriction should be used instead
if ($this->versioningWorkspaceId === 0) {
// Filter out placeholder records (new/moved/deleted items)
// in case we are NOT in a versioning preview (that means we are online!)
@@ -1286,7 +1287,8 @@ class PageRepository implements LoggerAwareInterface
$table . '.t3ver_state',
new VersionState(VersionState::DEFAULT_STATE)
);
- } elseif ($table !== 'pages') {
+ $constraints[] = $expressionBuilder->eq($table . '.t3ver_wsid', 0);
+ } else {
// show only records of live and of the current workspace
// in case we are in a versioning preview
$constraints[] = $expressionBuilder->orX(
@@ -1297,7 +1299,8 @@ class PageRepository implements LoggerAwareInterface
// Filter out versioned records
if (empty($ignore_array['pid'])) {
- $constraints[] = $expressionBuilder->neq($table . '.pid', -1);
+ // Always filter out versioned records that have an "offline" record
+ $constraints[] = $expressionBuilder->eq($table . '.t3ver_oid', 0);
}
}
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-89555-Workspace-relatedDatabaseRecordsContainTheProperPageID.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-89555-Workspace-relatedDatabaseRecordsContainTheProperPageID.rst
new file mode 100644
index 000000000000..09271c9ea51d
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Important-89555-Workspace-relatedDatabaseRecordsContainTheProperPageID.rst
@@ -0,0 +1,30 @@
+.. include:: ../../Includes.txt
+
+==================================================================================
+Important: #89555 - Workspace-related database records contain the proper Page ID.
+==================================================================================
+
+See :issue:`89555`
+
+Description
+===========
+
+Back in 2006, when the workspaces functionality was added to TYPO3 v4.0, Kasper - the original author of TYPO3 - provided an easy way to put workspaces on top while not worrying about existing logic. Every record that wasn't published had the "pid" field set to "-1" - and thus was filtered out from any database query without having to worry about specific implementations.
+
+14 years later, we have Doctrine DBAL and the solution for "enableFields" has been widely been replaced by Database Restrictions, allowing to modify database queries by TYPO3 Core without having to worry about custom queries.
+
+For workspaces however, it is and was very tedious to find the "real pid" for versioned records, and the "pid = -1" scenario is also one of the reasons why workspace overlays are more complex than they need to be.
+
+For this reason, TYPO3 Core now handles versioned records by validating their "t3ver_wsid" (the workspace ID the record is versioned in), "t3ver_state" (the type of the versioned record) and "t3ver_oid" (the live version of a record), and does not need to check for "pid=-1" anymore.
+
+This opens up a more straightforward approach to select and overlay
+records and reduce the need for some magic methods in TYPO3 Core,
+which still exist.
+
+An Upgrade Wizard transfers all "pid" fields of versioned records,
+into the real "pid" fields. TYPO3 Core now only checks for versionized records based on the other fields above.
+
+Please note: This only affects TYPO3 installations with workspaces enabled, and nothing should change for any extension if they use
+proper WorkspaceRestriction or Workspace Overlay mechanisms in TYPO3 v10.
+
+.. index:: Database, ext:workspaces
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php
index 9b2c89d53d28..c5a0d5e283a2 100644
--- a/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php
@@ -361,10 +361,11 @@ class PageRepositoryTest extends \TYPO3\TestingFramework\Core\Functional\Functio
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('pages');
$expectedSQL = sprintf(
- ' AND ((%s = 0) AND (%s <= 0) AND (%s <> -1) AND (%s = 0) AND (%s <= 1451779200) AND ((%s = 0) OR (%s > 1451779200))) AND (%s <> 255)',
+ ' AND ((%s = 0) AND (%s <= 0) AND (%s = 0) AND (%s = 0) AND (%s = 0) AND (%s <= 1451779200) AND ((%s = 0) OR (%s > 1451779200))) AND (%s <> 255)',
$connection->quoteIdentifier('pages.deleted'),
$connection->quoteIdentifier('pages.t3ver_state'),
- $connection->quoteIdentifier('pages.pid'),
+ $connection->quoteIdentifier('pages.t3ver_wsid'),
+ $connection->quoteIdentifier('pages.t3ver_oid'),
$connection->quoteIdentifier('pages.hidden'),
$connection->quoteIdentifier('pages.starttime'),
$connection->quoteIdentifier('pages.endtime'),
@@ -448,8 +449,8 @@ class PageRepositoryTest extends \TYPO3\TestingFramework\Core\Functional\Functio
);
self::assertThat(
$conditions,
- self::stringContains(' AND (' . $connection->quoteIdentifier($table . '.pid') . ' <> -1)'),
- 'Records from page -1'
+ self::stringContains(' AND (' . $connection->quoteIdentifier($table . '.t3ver_oid') . ' = 0)'),
+ 'Records with online version'
);
}
@@ -479,8 +480,8 @@ class PageRepositoryTest extends \TYPO3\TestingFramework\Core\Functional\Functio
);
self::assertThat(
$conditions,
- self::stringContains(' AND (' . $connection->quoteIdentifier($table . '.pid') . ' <> -1)'),
- 'Records from page -1'
+ self::stringContains(' AND (' . $connection->quoteIdentifier($table . '.t3ver_oid') . ' = 0)'),
+ 'Records from online versions'
);
}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/pages.xml b/typo3/sysext/core/Tests/Functional/Fixtures/pages.xml
index d709aa33e96a..316dcd3e3b55 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/pages.xml
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/pages.xml
@@ -83,7 +83,7 @@
</pages>
<pages>
<uid>12</uid>
- <pid>-1</pid>
+ <pid>0</pid>
<title>Workspace Root</title>
<deleted>0</deleted>
<t3ver_oid>11</t3ver_oid>
diff --git a/typo3/sysext/frontend/Tests/Functional/Fixtures/pages-title-tag.xml b/typo3/sysext/frontend/Tests/Functional/Fixtures/pages-title-tag.xml
index f7847bb96eb9..359cde8138d6 100644
--- a/typo3/sysext/frontend/Tests/Functional/Fixtures/pages-title-tag.xml
+++ b/typo3/sysext/frontend/Tests/Functional/Fixtures/pages-title-tag.xml
@@ -82,7 +82,7 @@
</pages>
<pages>
<uid>12</uid>
- <pid>-1</pid>
+ <pid>0</pid>
<title>Workspace Root</title>
<deleted>0</deleted>
<t3ver_oid>11</t3ver_oid>
diff --git a/typo3/sysext/impexp/Classes/Controller/ExportController.php b/typo3/sysext/impexp/Classes/Controller/ExportController.php
index f9ace33ff9a9..a491c9013f46 100644
--- a/typo3/sysext/impexp/Classes/Controller/ExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ExportController.php
@@ -25,8 +25,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Exception;
use TYPO3\CMS\Core\Http\HtmlResponse;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -404,13 +404,13 @@ class ExportController extends ImportExportController
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
$orderBy = $GLOBALS['TCA'][$table]['ctrl']['sortby'] ?: $GLOBALS['TCA'][$table]['ctrl']['default_sortby'];
- $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ $queryBuilder->getRestrictions()->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
if ($this->excludeDisabledRecords === false) {
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
}
$queryBuilder->select('*')
diff --git a/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
index 9ffdc2d9428f..198e3d04a68d 100644
--- a/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Configuration\Loader\PageTsConfigLoader;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -253,7 +253,7 @@ class InfoPageTyposcriptConfigController
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
$res = $queryBuilder
->select('uid', 'TSconfig')
diff --git a/typo3/sysext/info/Classes/Controller/TranslationStatusController.php b/typo3/sysext/info/Classes/Controller/TranslationStatusController.php
index 99f7c22c0ed9..59806e61c546 100644
--- a/typo3/sysext/info/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/info/Classes/Controller/TranslationStatusController.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Tree\View\PageTreeView;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -388,7 +388,7 @@ class TranslationStatusController
$queryBuilder
->getRestrictions()
->removeAll()
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class))
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace))
->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$result = $queryBuilder
->select('*')
@@ -431,7 +431,7 @@ class TranslationStatusController
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$count = $queryBuilder
->count('uid')
->from('tt_content')
diff --git a/typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php
index ad2e83b685cb..07f2547ce6e1 100644
--- a/typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php
@@ -19,6 +19,7 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\Updates\RowUpdater\RowUpdaterInterface;
+use TYPO3\CMS\Install\Updates\RowUpdater\WorkspaceVersionRecordsMigration;
/**
* This is a generic updater to migrate content of TCA rows.
@@ -44,6 +45,7 @@ class DatabaseRowsUpdateWizard implements UpgradeWizardInterface, RepeatableInte
* @var array Single classes that may update rows
*/
protected $rowUpdater = [
+ WorkspaceVersionRecordsMigration::class,
];
/**
diff --git a/typo3/sysext/install/Classes/Updates/RowUpdater/WorkspaceVersionRecordsMigration.php b/typo3/sysext/install/Classes/Updates/RowUpdater/WorkspaceVersionRecordsMigration.php
new file mode 100644
index 000000000000..c3abe8ba1647
--- /dev/null
+++ b/typo3/sysext/install/Classes/Updates/RowUpdater/WorkspaceVersionRecordsMigration.php
@@ -0,0 +1,93 @@
+<?php
+declare(strict_types=1);
+namespace TYPO3\CMS\Install\Updates\RowUpdater;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Versioning\VersionState;
+
+/**
+ * Migrate all records that have "pid=-1" to their proper equivalents.
+ * t3_wsid=0 AND pid=-1 ---> discarded records or archived records. Since we have no connection to the original anymore, we remove them (hard delete)
+ * t3_wsid>0 AND pid=-1 AND t3ver_oid>0 -> find the live version and take the PID from the live version, and replace the PID
+ * Since the move pointer (t3ver_state=3) is not affected, as it contains the future live PID, there is no need to touch these records.
+ *
+ * @internal This class is only meant to be used within EXT:install and is not part of the TYPO3 Core API.
+ */
+class WorkspaceVersionRecordsMigration implements RowUpdaterInterface, LoggerAwareInterface
+{
+ use LoggerAwareTrait;
+
+ public function getTitle(): string
+ {
+ return 'Scan for versioned records and fix their pid, or if no connection to a workspace is given, remove them completely to avoid having them shown on the live website.';
+ }
+
+ /**
+ * @param string $tableName Table name to check
+ * @return bool Return true if a table has workspace enabled
+ */
+ public function hasPotentialUpdateForTable(string $tableName): bool
+ {
+ return BackendUtility::isTableWorkspaceEnabled($tableName);
+ }
+
+ /**
+ * Update "pid" field or delete record completely
+ *
+ * @param string $tableName Table name
+ * @param array $row Given row data
+ * @return array Modified row data
+ */
+ public function updateTableRow(string $tableName, array $row): array
+ {
+ // We only modify records with "pid=-1"
+ if ((int)$row['pid'] !== -1) {
+ return $row;
+ }
+ // pid=-1 and live workspace => this may be very old "previous live" records that should be discarded
+ if ((int)$row['t3ver_wsid'] === 0) {
+ $row['deleted'] = 1;
+ // continue processing versions
+ }
+ // regular versions and placeholders (t3ver_state one of -1, 0, 2, 4 - but not 3) having t3ver_oid set
+ if ((int)$row['t3ver_oid'] > 0 && (int)$row['t3ver_state'] !== VersionState::MOVE_PLACEHOLDER) {
+ // We have a live version, let's connect that one
+ $liveRecord = $this->fetchPageId($tableName, (int)$row['t3ver_oid']);
+ if (is_array($liveRecord)) {
+ $row['pid'] = (int)$liveRecord['pid'];
+ return $row;
+ }
+ }
+ // move placeholder (t3ver_state=3) pointing to live version in t3ver_move_id
+ if ((int)$row['t3ver_move_id'] > 0 && (int)$row['t3ver_state'] === VersionState::MOVE_PLACEHOLDER) {
+ // We have a live version, let's connect that one
+ $liveRecord = $this->fetchPageId($tableName, (int)$row['t3ver_move_id']);
+ if (is_array($liveRecord)) {
+ $row['pid'] = (int)$liveRecord['pid'];
+ return $row;
+ }
+ }
+ // No live version available
+ return $row;
+ }
+
+ protected function fetchPageId(string $tableName, int $id): ?array
+ {
+ return BackendUtility::getRecord($tableName, $id, 'pid');
+ }
+}
diff --git a/typo3/sysext/install/Tests/Functional/Updates/Fixtures/tt_content_versions.csv b/typo3/sysext/install/Tests/Functional/Updates/Fixtures/tt_content_versions.csv
new file mode 100644
index 000000000000..39f70f400b72
--- /dev/null
+++ b/typo3/sysext/install/Tests/Functional/Updates/Fixtures/tt_content_versions.csv
@@ -0,0 +1,18 @@
+uid,pid,deleted,sorting,t3ver_wsid,t3ver_oid,t3ver_state,t3ver_move_id,l10n_parent,sys_language_uid,title
+11,20,0,128,0,0,0,0,0,0,Article #1
+12,20,0,256,0,0,0,0,0,0,Article #2
+13,20,0,384,0,0,0,0,0,0,Article #3
+21,-1,0,128,1,11,0,0,0,0,Article #1 modified
+22,-1,0,256,1,12,2,0,0,0,Article #2 deleted
+23,-1,0,384,1,13,4,0,0,0,Article #3 moved
+24,30,0,64,1,0,3,13,0,0,[MOVE_TO PLACEHOLDER for ...]
+25,20,0,512,1,0,1,0,0,0,Article #4 new
+26,-1,0,512,1,25,-1,0,0,0,Article #4 new
+27,20,1,640,0,0,1,0,0,0,Article #5 discarded
+28,-1,1,640,0,27,-1,0,0,0,Article #5 discarded
+29,41,0,128,1,0,1,0,0,0,Topic #1 Article new
+30,-1,0,128,1,29,-1,0,0,0,Topic #1 Article new
+31,20,0,192,1,0,1,0,11,1,Entrefilet #1 (fr)
+32,-1,0,192,1,31,-1,0,11,1,Entrefilet #1 (fr)
+33,20,0,224,1,0,1,0,11,2,Beitrag #1 (de)
+34,-1,0,224,1,33,-1,0,11,2,Beitrag #1 (de)
diff --git a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceVersionRecordMigrationTest.php b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceVersionRecordMigrationTest.php
new file mode 100644
index 000000000000..ac03c15e1c19
--- /dev/null
+++ b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceVersionRecordMigrationTest.php
@@ -0,0 +1,123 @@
+<?php
+declare(strict_types=1);
+namespace TYPO3\CMS\Install\Tests\Functional\RowUpdater;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use PHPUnit\Framework\MockObject\MockObject;
+use TYPO3\CMS\Install\Updates\RowUpdater\WorkspaceVersionRecordsMigration;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+class WorkspaceVersionRecordMigrationTest extends FunctionalTestCase
+{
+ private $records;
+
+ /**
+ * @var WorkspaceVersionRecordsMigration|MockObject
+ */
+ private $subject;
+
+ /**
+ * @var string[]
+ */
+ protected $coreExtensionsToLoad = ['frontend'];
+
+ protected function setUp(): void
+ {
+ parent::setUp();
+ $this->records = $this->fetchRecordsFromCsv();
+ $this->subject = $this->getMockBuilder(WorkspaceVersionRecordsMigration::class)
+ ->onlyMethods(['fetchPageId'])
+ ->getMock();
+ }
+
+ protected function tearDown(): void
+ {
+ unset($this->records, $this->subject);
+ parent::tearDown();
+ }
+
+ /**
+ * @test
+ */
+ public function hasPotentialUpdateForTtContent(): void
+ {
+ $this->subject->expects(self::never())->method('fetchPageId');
+ self::assertTrue($this->subject->hasPotentialUpdateForTable('tt_content'));
+ }
+
+ /**
+ * @test
+ */
+ public function recordsAreUpdated(): void
+ {
+ $this->subject->expects(self::atLeastOnce())
+ ->method('fetchPageId')
+ ->willReturnCallback(function ($tableName, $id) {
+ if ($tableName !== 'tt_content' || !isset($this->records[$id]['pid'])) {
+ return null;
+ }
+ return ['pid' => $this->records[$id]['pid']];
+ });
+ $records = [];
+ foreach ($this->records as $record) {
+ $records[] = $this->subject->updateTableRow('tt_content', $record);
+ }
+ $pageIds = array_column($records, 'pid', 'uid');
+ $pageIds = array_map('intval', $pageIds);
+ self::assertFalse(in_array(-1, $pageIds));
+
+ $differences = array_diff_key(
+ [
+ 21 => 20, // modified
+ 22 => 20, // deleted
+ 23 => 30, // moved
+ 26 => 20, // created
+ 28 => 20, // created & discarded
+ 30 => 41, // created & moved
+ 32 => 20, // localized
+ 34 => 20, // localized
+ ],
+ $pageIds
+ );
+ self::assertEmpty(
+ $differences,
+ sprintf('Different values for record IDs %s', implode(', ', array_keys($differences)))
+ );
+ }
+
+ /**
+ * Scenarios taken from https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/ApiOverview/Workspaces/Index.html#overview
+ * @return array
+ */
+ private function fetchRecordsFromCsv(): array
+ {
+ $records = [];
+ $resource = fopen(dirname(__DIR__) . '/Fixtures/tt_content_versions.csv', 'r');
+ while (false !== ($record = fgetcsv($resource))) {
+ $records[] = $record;
+ }
+ fclose($resource);
+
+ $names = array_shift($records);
+ $records = array_map(
+ function (array $values) use ($names) {
+ return array_combine($names, $values);
+ },
+ $records
+ );
+ $records = array_column($records, null, 'uid');
+ return $records;
+ }
+}
diff --git a/typo3/sysext/install/ext_localconf.php b/typo3/sysext/install/ext_localconf.php
index 72b5e6cb75b7..1efb81dedf3e 100644
--- a/typo3/sysext/install/ext_localconf.php
+++ b/typo3/sysext/install/ext_localconf.php
@@ -5,10 +5,6 @@ defined('TYPO3_MODE') or die();
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['extensionManagerTables']
= \TYPO3\CMS\Install\Updates\ExtensionManagerTables::class;
-// Update rows of many tables - Enable if new row updaters are needed again.
-//$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['databaseRowsUpdateWizard']
-// = \TYPO3\CMS\Install\Updates\DatabaseRowsUpdateWizard::class;
-
// v8->v9 wizards below this line
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['typo3DbLegacyExtension']
= \TYPO3\CMS\Install\Updates\Typo3DbExtractionUpdate::class;
@@ -48,6 +44,8 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['taskcenterEx
= \TYPO3\CMS\Install\Updates\TaskcenterExtractionUpdate::class;
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['sysActionExtension']
= \TYPO3\CMS\Install\Updates\SysActionExtractionUpdate::class;
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['databaseRowsUpdateWizard']
+ = \TYPO3\CMS\Install\Updates\DatabaseRowsUpdateWizard::class;
$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
$icons = [
diff --git a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
index 7da22e5371dd..d9583d13885c 100644
--- a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
@@ -23,8 +23,8 @@ use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Http\HtmlResponse;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -579,7 +579,7 @@ class RecordListController
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUserAuthentication()->workspace));
$statement = $queryBuilder->select('uid', $languageField)
->from('pages')
->where(
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
index 9196015f0b4d..70764f363294 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Tree\View\ElementBrowserPageTreeView;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\LinkHandling\LinkService;
use TYPO3\CMS\Core\Page\PageRenderer;
@@ -153,7 +153,7 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$contentElements = $queryBuilder
->select('*')
@@ -177,6 +177,7 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
// Enrich list of records
foreach ($contentElements as &$contentElement) {
+ BackendUtility::workspaceOL('tt_content', $contentElement);
$contentElement['url'] = GeneralUtility::makeInstance(LinkService::class)->asString(['type' => LinkService::TYPE_PAGE, 'pageuid' => (int)$pageId, 'fragment' => $contentElement['uid']]);
$contentElement['isSelected'] = !empty($this->linkParts) && (int)$this->linkParts['url']['fragment'] === (int)$contentElement['uid'];
$contentElement['icon'] = $this->iconFactory->getIconForRecord('tt_content', $contentElement, Icon::SIZE_SMALL)->render();
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index ecba9e9f9c7e..2e62cf10d469 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -27,8 +27,8 @@ use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Database\ReferenceIndex;
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -2954,7 +2954,7 @@ class DatabaseRecordList
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUserAuthentication()->workspace));
$queryBuilder = $this->addPageIdConstraint($tableName, $queryBuilder);
$firstRow = $queryBuilder->select('uid')
->from($tableName)
@@ -3132,7 +3132,7 @@ class DatabaseRecordList
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUserAuthentication()->workspace));
$queryBuilder
->select(...$fields)
->from($table);
@@ -3265,7 +3265,7 @@ class DatabaseRecordList
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUserAuthentication()->workspace));
$queryBuilder
->from($table);
@@ -3947,7 +3947,7 @@ class DatabaseRecordList
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUserAuthentication()->workspace));
$result = $queryBuilder
->select('*')
->from('pages')
diff --git a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
index 20280771ae71..c10a969675cb 100644
--- a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
@@ -539,7 +539,7 @@ class ActionHandler
public function sendToNextStageExecute(\stdClass $parameters)
{
$cmdArray = [];
- $setStageId = $parameters->affects->nextStage;
+ $setStageId = (int)$parameters->affects->nextStage;
$comments = $parameters->comments;
$table = $parameters->affects->table;
$uid = $parameters->affects->uid;
@@ -549,7 +549,7 @@ class ActionHandler
$currentWorkspace = $this->setTemporaryWorkspace($elementRecord['t3ver_wsid']);
$recipients = $this->getRecipientList((array)$parameters->recipients, $parameters->additional, $setStageId);
- if ($setStageId == StagesService::STAGE_PUBLISH_EXECUTE_ID) {
+ if ($setStageId === StagesService::STAGE_PUBLISH_EXECUTE_ID) {
$cmdArray[$table][$t3ver_oid]['version']['action'] = 'swap';
$cmdArray[$table][$t3ver_oid]['version']['swapWith'] = $uid;
$cmdArray[$table][$t3ver_oid]['version']['comment'] = $comments;
@@ -632,7 +632,7 @@ class ActionHandler
public function sendToSpecificStageExecute(\stdClass $parameters)
{
$cmdArray = [];
- $setStageId = $parameters->affects->nextStage;
+ $setStageId = (int)$parameters->affects->nextStage;
$comments = $parameters->comments;
$elements = $parameters->affects->elements;
$recipients = $this->getRecipientList((array)$parameters->recipients, $parameters->additional, $setStageId);
@@ -643,7 +643,7 @@ class ActionHandler
continue;
}
- if ($setStageId == StagesService::STAGE_PUBLISH_EXECUTE_ID) {
+ if ($setStageId === StagesService::STAGE_PUBLISH_EXECUTE_ID) {
$cmdArray[$element->table][$element->t3ver_oid]['version']['action'] = 'swap';
$cmdArray[$element->table][$element->t3ver_oid]['version']['swapWith'] = $element->uid;
$cmdArray[$element->table][$element->t3ver_oid]['version']['comment'] = $comments;
diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
index 285478c35657..d764fde24ef1 100644
--- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -21,8 +21,8 @@ use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Database\ReferenceIndex;
use TYPO3\CMS\Core\Database\RelationHandler;
use TYPO3\CMS\Core\DataHandling\DataHandler;
@@ -350,12 +350,10 @@ class DataHandlerHook
return;
}
$tableSupportsVersioning = BackendUtility::isTableWorkspaceEnabled($table);
- if ($destPid < 0) {
- // Fetch move placeholder, since it might point to a new page in the current workspace
- $movePlaceHolder = BackendUtility::getMovePlaceholder($table, abs($destPid), 'uid,pid');
- if ($movePlaceHolder !== false) {
- $resolvedPid = $movePlaceHolder['pid'];
- }
+ // Fetch move placeholder, since it might point to a new page in the current workspace
+ $movePlaceHolder = BackendUtility::getMovePlaceholder($table, abs($destPid), 'uid,pid');
+ if ($movePlaceHolder !== false && $destPid < 0) {
+ $resolvedPid = $movePlaceHolder['pid'];
}
$recordWasMoved = true;
$moveRecVersionState = VersionState::cast($moveRec['t3ver_state']);
@@ -406,7 +404,7 @@ class DataHandlerHook
// If the move operation is done on a versioned record, which is
// NOT new/deleted placeholder, then also create a move placeholder
if ($workspaceVersion['uid'] && !$recIsNewVersion && BackendUtility::isTableWorkspaceEnabled($table)) {
- $this->moveRecord_wsPlaceholders($table, (int)$uid, (int)$destPid, (int)$workspaceVersion['uid'], $dataHandler);
+ $this->moveRecord_wsPlaceholders($table, (int)$uid, (int)$destPid, (int)$resolvedPid, (int)$workspaceVersion['uid'], $dataHandler);
} else {
// moving not needed, just behave like in live workspace
$recordWasMoved = false;
@@ -707,8 +705,7 @@ class DataHandlerHook
unset($swapVersion['uid']);
// Modify online version to become offline:
unset($curVersion['uid']);
- // Set pid for OFFLINE
- $curVersion['pid'] = -1;
+ // Mark curVersion to contain the oid
$curVersion['t3ver_oid'] = (int)$id;
$curVersion['t3ver_wsid'] = $swapIntoWS ? (int)$tmp_wsid : 0;
$curVersion['t3ver_tstamp'] = $GLOBALS['EXEC_TIME'];
@@ -801,7 +798,7 @@ class DataHandlerHook
}
// Checking for delete:
// Delete only if new/deleted placeholders are there.
- if (!$swapIntoWS && ((int)$t3ver_state['swapVersion'] === 1 || (int)$t3ver_state['swapVersion'] === 2)) {
+ if (!$swapIntoWS && ((int)$t3ver_state['swapVersion'] === VersionState::NEW_PLACEHOLDER || (int)$t3ver_state['swapVersion'] === VersionState::DELETE_PLACEHOLDER)) {
// Force delete
$dataHandler->deleteEl($table, $id, true);
}
@@ -1051,7 +1048,7 @@ class DataHandlerHook
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, $workspaceId, false));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $workspaceId));
$result = $queryBuilder
->select('uid')
@@ -1314,20 +1311,19 @@ class DataHandlerHook
* @param string $table Table name to move
* @param int $uid Record uid to move (online record)
* @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+ * @param int $resolvedId Effective page ID
* @param int $offlineUid UID of offline version of online record
* @param DataHandler $dataHandler DataHandler object
* @see moveRecord()
*/
- protected function moveRecord_wsPlaceholders(string $table, int $uid, int $destPid, int $offlineUid, DataHandler $dataHandler): void
+ protected function moveRecord_wsPlaceholders(string $table, int $uid, int $destPid, int $resolvedId, int $offlineUid, DataHandler $dataHandler): void
{
// If a record gets moved after a record that already has a placeholder record
// then the new placeholder record needs to be after the existing one
$originalRecordDestinationPid = $destPid;
- if ($destPid < 0) {
- $movePlaceHolder = BackendUtility::getMovePlaceholder($table, abs($destPid), 'uid');
- if ($movePlaceHolder !== false) {
- $destPid = -$movePlaceHolder['uid'];
- }
+ $movePlaceHolder = BackendUtility::getMovePlaceholder($table, abs($destPid), 'uid');
+ if ($movePlaceHolder !== false && $destPid < 0) {
+ $destPid = -$movePlaceHolder['uid'];
}
if ($plh = BackendUtility::getMovePlaceholder($table, $uid, 'uid')) {
// If already a placeholder exists, move it:
@@ -1388,6 +1384,7 @@ class DataHandlerHook
}
unset($l10nParentRec);
}
+ // @todo Check why $destPid cannot be used directly
// Initially, create at root level.
$newVersion_placeholderFieldArray['pid'] = 0;
$id = 'NEW_MOVE_PLH';
@@ -1398,6 +1395,7 @@ class DataHandlerHook
// Move the workspace-version of the original to be the version of the move-to-placeholder:
// Setting placeholder state value for version (so it can know it is currently a new version...)
$updateFields = [
+ 'pid' => $resolvedId,
't3ver_state' => (string)new VersionState(VersionState::MOVE_POINTER)
];
diff --git a/typo3/sysext/workspaces/Classes/Preview/PreviewUriBuilder.php b/typo3/sysext/workspaces/Classes/Preview/PreviewUriBuilder.php
index a635855a4e89..0d23ab526475 100644
--- a/typo3/sysext/workspaces/Classes/Preview/PreviewUriBuilder.php
+++ b/typo3/sysext/workspaces/Classes/Preview/PreviewUriBuilder.php
@@ -21,8 +21,8 @@ use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
use TYPO3\CMS\Core\Routing\InvalidRouteArgumentsException;
use TYPO3\CMS\Core\Routing\UnableToLinkToPageException;
@@ -272,7 +272,7 @@ class PreviewUriBuilder
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
- ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+ ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, (int)$this->getBackendUser()->workspace));
$result = $queryBuilder->select('sys_language_uid')
->from('pages')
diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
index 63005013ec72..04c7f5e9322b 100644
--- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
@@ -464,10 +464,6 @@ class WorkspaceService implements SingletonInterface
'B.t3ver_wsid',
$queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
),
- $queryBuilder->expr()->eq(
- 'C.pid',
- $queryBuilder->createNamedParameter(-1, \PDO::PARAM_INT)
- ),
$queryBuilder->expr()->eq(
'C.t3ver_state',
$queryBuilder->createNamedParameter(
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
index 8f5688c7073e..157aa671f2f0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
@@ -4,11 +4,11 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,0,0,127,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
-,131,-1,0,0,0,1,0,0,126,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
+,130,89,0,0,0,1,0,0,127,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
+,131,89,0,0,0,1,0,0,126,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,256,0,0,0,1,4,0,330,0,"Regular Element #1",2,,,,,,,,
+,332,89,256,0,0,0,1,4,0,330,0,"Regular Element #1",2,,,,,,,,
,333,89,768,0,0,0,1,3,0,0,330,"[MOVE-TO PLACEHOLDER for #330, WS#1]",0,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
index 961bdb59cede..c318757b0896 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
@@ -5,12 +5,12 @@
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,130,89,0,0,0,1,1,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,-1,0,130,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,89,0,0,0,1,-1,0,130,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,132,89,0,0,0,1,1,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,133,-1,0,0,0,1,-1,0,132,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,133,89,0,0,0,1,-1,0,132,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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
,332,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",0,,,,,,,,
-,333,-1,128,0,0,0,1,-1,0,332,0,"Regular Element #2 (copy 1)",2,,,,,,,,
+,333,89,128,0,0,0,1,-1,0,332,0,"Regular Element #2 (copy 1)",2,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
index bf28ad041212..65645122dc08 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
@@ -5,10 +5,10 @@
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,130,89,0,0,0,1,1,0,0,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,,
-,131,-1,0,0,0,1,-1,0,130,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,,
+,131,89,0,0,0,1,-1,0,130,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
,332,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,,,,,,
-,333,-1,128,0,0,0,1,-1,0,332,0,"Testing #1",1,,,,,,,,
+,333,89,128,0,0,0,1,-1,0,332,0,"Testing #1",1,,,,,,,,
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 8c440177326a..32b0f3e205c2 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
@@ -4,10 +4,10 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,2,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,130,89,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,89,0,0,0,1,2,0,129,0,1,331,"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,2,0,331,0,"Regular Element #2",2,,,,,,,,
+,332,89,512,0,0,0,1,2,0,331,0,"Regular Element #2",2,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
index 6e74d341e1dd..421cae090685 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
@@ -5,12 +5,12 @@
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,130,89,0,1,128,1,1,0,0,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,,
-,131,-1,0,1,128,1,-1,0,130,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,,
+,131,89,0,1,128,1,-1,0,130,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,,
,132,89,0,1,129,1,1,0,0,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,,
-,133,-1,0,1,129,1,-1,0,132,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,,
+,133,89,0,1,129,1,-1,0,132,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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
,332,89,768,0,1,331,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",0,,,,,,,,
-,333,-1,768,0,1,331,1,-1,0,332,0,"[Translate to Dansk:] Regular Element #2",2,,,,,,,,
+,333,89,768,0,1,331,1,-1,0,332,0,"[Translate to Dansk:] Regular Element #2",2,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
index 32330c4e74e7..19cb0289ac45 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
@@ -4,10 +4,10 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,0,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,130,89,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,89,0,0,0,1,0,0,129,0,1,331,"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,0,0,331,0,"Testing #1",2,,,,,,,,
+,332,89,512,0,0,0,1,0,0,331,0,"Testing #1",2,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
index f5669f79c0f1..c800daa2ea76 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
@@ -4,12 +4,12 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,0,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,130,89,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,89,0,0,0,1,0,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,132,89,0,0,0,1,1,0,0,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,,
-,133,-1,0,0,0,1,-1,0,132,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,,
+,133,89,0,0,0,1,-1,0,132,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,0,0,331,0,"Regular Element #2",3,,,,,,,,
+,332,89,512,0,0,0,1,0,0,331,0,"Regular Element #2",3,,,,,,,,
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 9f88a0fcb5ed..3d69b07d5d7a 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
@@ -4,10 +4,10 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,2,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,131,-1,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,130,89,0,0,0,1,2,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,131,89,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,0,0,331,0,"Regular Element #2",0,,,,,,,,
+,332,89,512,0,0,0,1,0,0,331,0,"Regular Element #2",0,,,,,,,,
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 c7a48a40a441..f754e6afdb62 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
@@ -4,10 +4,10 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,0,0,129,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,,
-,131,-1,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,130,89,0,0,0,1,0,0,129,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,,
+,131,89,0,0,0,1,2,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,0,0,331,0,"Regular Element #2",1,,,,,,,,
+,332,89,512,0,0,0,1,0,0,331,0,"Regular Element #2",1,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
index cb1593acd61c..5544289f5570 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
@@ -4,10 +4,10 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,0,0,129,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,,
+,130,89,0,0,0,1,0,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,89,0,0,0,1,0,0,129,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,0,0,331,0,"Testing #1",2,,,,,,,,
+,332,89,512,0,0,0,1,0,0,331,0,"Testing #1",2,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
index f7fdf61c802f..d8b43446ece2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
@@ -4,13 +4,13 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,4,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,4,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,130,90,0,0,0,1,4,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,90,0,0,0,1,4,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,132,90,0,0,0,1,3,0,0,128,0,331,"tt_content","image",0,"sys_file",,,,,
,133,90,0,0,0,1,3,0,0,129,0,331,"tt_content","image",0,"sys_file",,,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,4,0,331,0,"Regular Element #2",2,,,,,,,,
+,332,90,512,0,0,0,1,4,0,331,0,"Regular Element #2",2,,,,,,,,
,333,90,256,0,0,0,1,3,0,0,331,"[MOVE-TO PLACEHOLDER for #331, WS#1]",0,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 90196018b84b..df66975f272a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -4,19 +4,19 @@
,127,89,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
,128,89,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
,129,89,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
-,130,-1,0,0,0,1,4,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,131,-1,0,0,0,1,4,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,130,90,0,0,0,1,4,0,128,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,131,90,0,0,0,1,4,0,129,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
,132,90,0,0,0,1,3,0,0,128,0,331,"tt_content","image",0,"sys_file",,,,,
,133,90,0,0,0,1,3,0,0,129,0,331,"tt_content","image",0,"sys_file",,,,,
-,134,-1,0,0,0,1,4,0,127,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
-,135,-1,0,0,0,1,4,0,126,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
+,134,90,0,0,0,1,4,0,127,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
+,135,90,0,0,0,1,4,0,126,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
,136,90,0,0,0,1,3,0,0,127,0,330,"tt_content","image",0,"sys_file",,,,,
,137,90,0,0,0,1,3,0,0,126,0,330,"tt_content","image",0,"sys_file",,,,,
"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,,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,
-,332,-1,512,0,0,0,1,4,0,331,0,"Regular Element #2",2,,,,,,,,
+,332,90,512,0,0,0,1,4,0,331,0,"Regular Element #2",2,,,,,,,,
,333,90,256,0,0,0,1,3,0,0,331,"[MOVE-TO PLACEHOLDER for #331, WS#1]",0,,,,,,,,
-,334,-1,256,0,0,0,1,4,0,330,0,"Regular Element #1",2,,,,,,,,
+,334,90,256,0,0,0,1,4,0,330,0,"Regular Element #1",2,,,,,,,,
,335,90,512,0,0,0,1,3,0,0,330,"[MOVE-TO PLACEHOLDER for #330, WS#1]",0,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
index e7d29cce8060..c02b3816ea52 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","1,2,3"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","1,2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
index c7fb6cd2672f..6b137734f13d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","2,1"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","2,1"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
index cbf7d6d44ac2..92eb57bac4c8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
@@ -13,5 +13,5 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,4,0,1,0,"Element #1",
+,4,89,256,0,0,0,1,4,0,1,0,"Element #1",
,5,89,640,0,0,0,1,3,0,0,1,"[MOVE-TO PLACEHOLDER for #1, WS#1]",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
index bf6669644aaf..495874e5fcc1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)","2,3"
-,300,-1,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)","2,3"
+,300,89,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
index f890fce21431..af35f0609055 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
@@ -14,4 +14,4 @@
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,1,0,0,0,"Element #1 (copy 1)",
-,5,-1,128,0,0,0,1,-1,0,4,0,"Element #1 (copy 1)",
+,5,89,128,0,0,0,1,-1,0,4,0,"Element #1 (copy 1)",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
index fc16235921ab..88030bba00c0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",1
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
index 788e6cc4d709..23b970c69e03 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
@@ -9,11 +9,11 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",4
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",4
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",4
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,1,0,0,0,"Testing #1",
-,5,-1,128,0,0,0,1,-1,0,4,0,"Testing #1",
+,5,89,128,0,0,0,1,-1,0,4,0,"Testing #1",
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 9f348beff8a1..9ce891b45b47 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
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2","2,3"
+,299,89,512,0,0,0,1,2,0,298,0,"Regular Element #2","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
index d7ce60d3c38d..786e8fe71e65 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
@@ -13,4 +13,4 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,2,0,1,0,"Element #1",
+,4,89,256,0,0,0,1,2,0,1,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
index 0eccb3aa5562..fad0fff2b460 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",1
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",1
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
index d3df3ad6da87..d93e17ab695c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2","2,3"
-,300,-1,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2","2,3"
+,300,89,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
index 61ede3492a94..75efe1fdb0bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
,91,88,256,0,1,1,0,0,0,"[Translate to Dansk:] Relations",,,
-,92,-1,256,0,1,-1,0,91,0,"[Translate to Dansk:] Relations",,,
+,92,88,256,0,1,-1,0,91,0,"[Translate to Dansk:] Relations",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
@@ -16,4 +16,4 @@
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,1,1,1,0,0,0,"[Translate to Dansk:] Element #1",
-,5,-1,384,0,1,1,1,-1,0,4,0,"[Translate to Dansk:] Element #1",
+,5,89,384,0,1,1,1,-1,0,4,0,"[Translate to Dansk:] Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
index 0164be1686d8..035f9dd4ab71 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
@@ -8,10 +8,10 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,0,0,1,0,"Testing #1",
+,4,89,256,0,0,0,1,0,0,1,0,"Testing #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
index 87d5f8b4fb98..5372354b7396 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
index ac41e772eba9..f35ea4c8ac03 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
@@ -13,4 +13,4 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,0,0,1,0,"Testing #1",
+,4,89,256,0,0,0,1,0,0,1,0,"Testing #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index 9d367cf9b174..ffe4af05a3da 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2","2,3"
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2","2,3"
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
index 8fa2d07429a9..dcedfc9ea64e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1","3,4"
+,299,89,256,0,0,0,1,4,0,297,0,"Regular Element #1","3,4"
,300,89,768,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,0,0,4,0,"Hotel #2",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,0,0,4,0,"Hotel #2",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -29,9 +29,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
index 48041ba6a0ec..2eef6e0638df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
@@ -5,26 +5,26 @@
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
,91,90,256,0,1,1,0,0,0,"Relations",,,
-,92,-1,256,0,1,-1,0,91,0,"Relations",,,
+,92,90,256,0,1,-1,0,91,0,"Relations",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",6
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",6
+,300,91,256,0,0,0,1,-1,0,299,0,"Regular Element #2",6
,301,91,128,0,0,0,1,1,0,0,0,"Regular Element #1","8,10"
-,302,-1,128,0,0,0,1,-1,0,301,0,"Regular Element #1","8,10"
+,302,91,128,0,0,0,1,-1,0,301,0,"Regular Element #1","8,10"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,91,256,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,91,256,0,0,0,1,-1,0,6,0,"Hotel #1",9
,8,91,128,0,0,0,1,1,0,0,0,"Hotel #1","11,13"
-,9,-1,128,0,0,0,1,-1,0,8,0,"Hotel #1","11,13"
+,9,91,128,0,0,0,1,-1,0,8,0,"Hotel #1","11,13"
,10,91,64,0,0,0,1,1,0,0,0,"Hotel #2",15
-,11,-1,64,0,0,0,1,-1,0,10,0,"Hotel #2",15
+,11,91,64,0,0,0,1,-1,0,10,0,"Hotel #2",15
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -32,13 +32,13 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,91,256,0,0,0,1,1,0,0,0,"Offer #1.1",14
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #1.1",14
+,10,91,256,0,0,0,1,-1,0,9,0,"Offer #1.1",14
,11,91,128,0,0,0,1,1,0,0,0,"Offer #1.1","16,18,20"
-,12,-1,128,0,0,0,1,-1,0,11,0,"Offer #1.1","16,18,20"
+,12,91,128,0,0,0,1,-1,0,11,0,"Offer #1.1","16,18,20"
,13,91,64,0,0,0,1,1,0,0,0,"Offer #1.2","22,24"
-,14,-1,64,0,0,0,1,-1,0,13,0,"Offer #1.2","22,24"
+,14,91,64,0,0,0,1,-1,0,13,0,"Offer #1.2","22,24"
,15,91,32,0,0,0,1,1,0,0,0,"Offer #2.1",26
-,16,-1,32,0,0,0,1,-1,0,15,0,"Offer #2.1",26
+,16,91,32,0,0,0,1,-1,0,15,0,"Offer #2.1",26
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -49,16 +49,16 @@
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,91,256,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
+,15,91,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
,16,91,128,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,17,-1,128,0,0,0,1,-1,0,16,0,"Price #1.1.1",
+,17,91,128,0,0,0,1,-1,0,16,0,"Price #1.1.1",
,18,91,64,0,0,0,1,1,0,0,0,"Price #1.1.2",
-,19,-1,64,0,0,0,1,-1,0,18,0,"Price #1.1.2",
+,19,91,64,0,0,0,1,-1,0,18,0,"Price #1.1.2",
,20,91,32,0,0,0,1,1,0,0,0,"Price #1.1.3",
-,21,-1,32,0,0,0,1,-1,0,20,0,"Price #1.1.3",
+,21,91,32,0,0,0,1,-1,0,20,0,"Price #1.1.3",
,22,91,16,0,0,0,1,1,0,0,0,"Price #1.2.1",
-,23,-1,16,0,0,0,1,-1,0,22,0,"Price #1.2.1",
+,23,91,16,0,0,0,1,-1,0,22,0,"Price #1.2.1",
,24,91,8,0,0,0,1,1,0,0,0,"Price #1.2.2",
-,25,-1,8,0,0,0,1,-1,0,24,0,"Price #1.2.2",
+,25,91,8,0,0,0,1,-1,0,24,0,"Price #1.2.2",
,26,91,4,0,0,0,1,1,0,0,0,"Price #2.1.1",
-,27,-1,4,0,0,0,1,-1,0,26,0,"Price #2.1.1",
+,27,91,4,0,0,0,1,-1,0,26,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index 1ff1cc6ce692..6363419584f8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -5,26 +5,26 @@
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
,91,90,256,0,1,1,0,0,0,"Relations",,,
-,92,-1,256,0,1,-1,0,91,0,"Relations",,,
+,92,90,256,0,1,-1,0,91,0,"Relations",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",10
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",10
+,300,91,256,0,0,0,1,-1,0,299,0,"Regular Element #2",10
,301,91,128,0,0,0,1,1,0,0,0,"Regular Element #1","6,8"
-,302,-1,128,0,0,0,1,-1,0,301,0,"Regular Element #1","6,8"
+,302,91,128,0,0,0,1,-1,0,301,0,"Regular Element #1","6,8"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,91,256,0,0,0,1,1,0,0,0,"Hotel #1","9,11"
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #1","9,11"
+,7,91,256,0,0,0,1,-1,0,6,0,"Hotel #1","9,11"
,8,91,128,0,0,0,1,1,0,0,0,"Hotel #2",13
-,9,-1,128,0,0,0,1,-1,0,8,0,"Hotel #2",13
+,9,91,128,0,0,0,1,-1,0,8,0,"Hotel #2",13
,10,91,64,0,0,0,1,1,0,0,0,"Hotel #1",15
-,11,-1,64,0,0,0,1,-1,0,10,0,"Hotel #1",15
+,11,91,64,0,0,0,1,-1,0,10,0,"Hotel #1",15
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -32,13 +32,13 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,91,256,0,0,0,1,1,0,0,0,"Offer #1.1","14,16,18"
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #1.1","14,16,18"
+,10,91,256,0,0,0,1,-1,0,9,0,"Offer #1.1","14,16,18"
,11,91,128,0,0,0,1,1,0,0,0,"Offer #1.2","20,22"
-,12,-1,128,0,0,0,1,-1,0,11,0,"Offer #1.2","20,22"
+,12,91,128,0,0,0,1,-1,0,11,0,"Offer #1.2","20,22"
,13,91,64,0,0,0,1,1,0,0,0,"Offer #2.1",24
-,14,-1,64,0,0,0,1,-1,0,13,0,"Offer #2.1",24
+,14,91,64,0,0,0,1,-1,0,13,0,"Offer #2.1",24
,15,91,32,0,0,0,1,1,0,0,0,"Offer #1.1",26
-,16,-1,32,0,0,0,1,-1,0,15,0,"Offer #1.1",26
+,16,91,32,0,0,0,1,-1,0,15,0,"Offer #1.1",26
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -49,16 +49,16 @@
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,91,256,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
+,15,91,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
,16,91,128,0,0,0,1,1,0,0,0,"Price #1.1.2",
-,17,-1,128,0,0,0,1,-1,0,16,0,"Price #1.1.2",
+,17,91,128,0,0,0,1,-1,0,16,0,"Price #1.1.2",
,18,91,64,0,0,0,1,1,0,0,0,"Price #1.1.3",
-,19,-1,64,0,0,0,1,-1,0,18,0,"Price #1.1.3",
+,19,91,64,0,0,0,1,-1,0,18,0,"Price #1.1.3",
,20,91,32,0,0,0,1,1,0,0,0,"Price #1.2.1",
-,21,-1,32,0,0,0,1,-1,0,20,0,"Price #1.2.1",
+,21,91,32,0,0,0,1,-1,0,20,0,"Price #1.2.1",
,22,91,16,0,0,0,1,1,0,0,0,"Price #1.2.2",
-,23,-1,16,0,0,0,1,-1,0,22,0,"Price #1.2.2",
+,23,91,16,0,0,0,1,-1,0,22,0,"Price #1.2.2",
,24,91,8,0,0,0,1,1,0,0,0,"Price #2.1.1",
-,25,-1,8,0,0,0,1,-1,0,24,0,"Price #2.1.1",
+,25,91,8,0,0,0,1,-1,0,24,0,"Price #2.1.1",
,26,91,4,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,27,-1,4,0,0,0,1,-1,0,26,0,"Price #1.1.1",
+,27,91,4,0,0,0,1,-1,0,26,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
index 04d44681b251..064ce101aba6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
@@ -3,14 +3,14 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",6
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -18,7 +18,7 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1.1",14
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1.1",14
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1.1",14
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -29,4 +29,4 @@
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,2,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,15,-1,2,0,0,0,1,-1,0,14,0,"Price #1.1.1",
+,15,89,2,0,0,0,1,-1,0,14,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
index 4e92a9ddeecf..d64b43ced5f8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -9,14 +9,14 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,90,256,0,0,0,1,1,0,0,0,"Regular Element #2",6
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",6
+,300,90,256,0,0,0,1,-1,0,299,0,"Regular Element #2",6
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,90,256,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,90,256,0,0,0,1,-1,0,6,0,"Hotel #1",9
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -24,7 +24,7 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,90,256,0,0,0,1,1,0,0,0,"Offer #1.1",14
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #1.1",14
+,10,90,256,0,0,0,1,-1,0,9,0,"Offer #1.1",14
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -35,4 +35,4 @@
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,90,256,0,0,0,1,1,0,0,0,"Price #1.1.1",
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
+,15,90,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 39d8e34e3065..71ebcc764f24 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,64,0,0,0,1,1,0,0,0,"Testing #1 (copy 1)",8
-,302,-1,64,0,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
+,302,89,64,0,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,16,0,0,0,1,1,0,0,0,"Hotel #1",11
-,9,-1,16,0,0,0,1,-1,0,8,0,"Hotel #1",11
+,9,89,16,0,0,0,1,-1,0,8,0,"Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1",
,11,89,8,0,0,0,1,1,0,0,0,"Offer #1",
-,12,-1,8,0,0,0,1,-1,0,11,0,"Offer #1",
+,12,89,8,0,0,0,1,-1,0,11,0,"Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index 2d109fa5bfff..3df797dc7312 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",8
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,16,1,0,0,1,1,0,0,0,"Hotel #1",11
-,9,-1,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
+,9,89,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1",
,11,89,8,1,0,0,1,1,0,0,0,"Offer #1",
-,12,-1,8,1,0,0,1,-1,0,11,0,"Offer #1",
+,12,89,8,1,0,0,1,-1,0,11,0,"Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index ed2849f116dc..5a2a3dca8bb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,1,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,1,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,1,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,1,0,0,1,-1,0,9,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index f295867b4d58..bc24cefef1f1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index aadbfe112331..3dbeadfa48b3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,192,0,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,48,0,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,0,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,0,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1",
,11,89,24,0,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,0,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,0,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
index ea0fffee9a7f..c8cb225cea98 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
@@ -3,4 +3,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index 30de6a48c296..f4af5c3a21eb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -3,14 +3,14 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",6
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,0,0,0,1,-1,0,6,0,"Hotel #1",9
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -18,7 +18,7 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,0,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,0,0,0,1,-1,0,9,0,"Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
index b466b80571c4..a63de4a32a85 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,"DataHandlerTest",,,
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
-,91,-1,256,0,1,2,0,89,0,"Relations",,,
+,91,88,256,0,1,2,0,89,0,"Relations",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
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 838a724b87f5..80b2821d1da7 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
@@ -2,20 +2,20 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",5
+,299,89,512,0,0,0,1,2,0,298,0,"Regular Element #2",5
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,64,0,0,0,1,2,0,5,0,"Hotel #1",8
+,6,89,64,0,0,0,1,2,0,5,0,"Hotel #1",8
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,32,0,0,0,1,2,0,8,0,"Offer #1.1",13
+,9,89,32,0,0,0,1,2,0,8,0,"Offer #1.1",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -25,4 +25,4 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,4,0,0,0,1,2,0,13,0,"Price #1.1.1",
+,14,89,4,0,0,0,1,2,0,13,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
index 7c9a27a7fef2..7240d974ccf4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -3,14 +3,14 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",6
-,300,-1,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",6
+,300,89,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",6
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,96,0,1,5,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",9
-,7,-1,96,0,1,5,1,-1,0,6,0,"[Translate to Dansk:] Hotel #1",9
+,7,89,96,0,1,5,1,-1,0,6,0,"[Translate to Dansk:] Hotel #1",9
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -18,7 +18,7 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,48,0,1,8,1,1,0,0,0,"[Translate to Dansk:] Offer #1.1",14
-,10,-1,48,0,1,8,1,-1,0,9,0,"[Translate to Dansk:] Offer #1.1",14
+,10,89,48,0,1,8,1,-1,0,9,0,"[Translate to Dansk:] Offer #1.1",14
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -29,4 +29,4 @@
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,6,0,1,13,1,1,0,0,0,"[Translate to Dansk:] Price #1.1.1",
-,15,-1,6,0,1,13,1,-1,0,14,0,"[Translate to Dansk:] Price #1.1.1",
+,15,89,6,0,1,13,1,-1,0,14,0,"[Translate to Dansk:] Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index d1a538e1d846..cd110af74af2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,25 +2,25 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
-,300,-1,256,0,0,0,1,0,0,297,0,"Testing #2","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
+,300,89,256,0,0,0,1,0,0,297,0,"Testing #2","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
-,8,-1,128,0,0,0,1,0,0,4,0,"Testing #2",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,8,89,128,0,0,0,1,0,0,4,0,"Testing #2",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -30,9 +30,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
index 426c3b095c8c..f070f2c57aa1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -7,14 +7,14 @@
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,128,0,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,128,0,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -24,4 +24,4 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
index 54a26cf45099..a8d44ffb7823 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,"DataHandlerTest",,,
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
-,91,-1,256,0,1,0,0,89,0,"Testing #1",,,
+,91,88,256,0,1,0,0,89,0,"Testing #1",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
index 8996fc41686e..06f20b1d502e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
@@ -2,20 +2,20 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,512,0,0,0,1,0,0,298,0,"Testing #1",5
+,299,89,512,0,0,0,1,0,0,298,0,"Testing #1",5
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,64,0,0,0,1,0,0,5,0,"Hotel #1",8
+,6,89,64,0,0,0,1,0,0,5,0,"Hotel #1",8
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,32,0,0,0,1,0,0,8,0,"Offer #1.1",13
+,9,89,32,0,0,0,1,0,0,8,0,"Offer #1.1",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -25,4 +25,4 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,4,0,0,0,1,0,0,13,0,"Price #1.1.1",
+,14,89,4,0,0,0,1,0,0,13,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
index c9c592bae44d..5ac80da29db3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -2,22 +2,22 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,512,0,0,0,1,0,0,298,0,"Regular Element #2","5,7"
+,299,89,512,0,0,0,1,0,0,298,0,"Regular Element #2","5,7"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,64,0,0,0,1,0,0,5,0,"Hotel #1",8
+,6,89,64,0,0,0,1,0,0,5,0,"Hotel #1",8
,7,89,32,0,0,0,1,1,0,0,0,"Hotel #2",
-,8,-1,32,0,0,0,1,-1,0,7,0,"Hotel #2",
+,8,89,32,0,0,0,1,-1,0,7,0,"Hotel #2",
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,32,0,0,0,1,0,0,8,0,"Offer #1.1",13
+,9,89,32,0,0,0,1,0,0,8,0,"Offer #1.1",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -27,4 +27,4 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,4,0,0,0,1,0,0,13,0,"Price #1.1.1",
+,14,89,4,0,0,0,1,0,0,13,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index ecc30bbe35df..5e314aa7a30c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","4,3"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","4,3"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,0,0,4,0,"Hotel #2",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,0,0,4,0,"Hotel #2",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
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 4bc6290b9edd..3b98df4f8bf9 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
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",3
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",3
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,2,0,4,0,"Hotel #2",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,2,0,4,0,"Hotel #2",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,2,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,2,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,2,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,2,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
index e15945cfda6f..43392269f5e0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
index c7489d2dd5b9..321f712a136f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 0497dd5a9c49..d9d21b1bab04 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
index 2da581b9b19a..1fb08a1f2a09 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -2,14 +2,14 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",5
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2",5
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",5
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,64,0,0,0,1,4,0,5,0,"Hotel #1",8
+,6,90,64,0,0,0,1,4,0,5,0,"Hotel #1",8
,7,90,256,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]",8
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
@@ -17,7 +17,7 @@
,6,89,128,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,32,0,0,0,1,4,0,8,0,"Offer #1.1",13
+,9,90,32,0,0,0,1,4,0,8,0,"Offer #1.1",13
,10,90,256,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
@@ -28,5 +28,5 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,4,0,0,0,1,4,0,13,0,"Price #1.1.1",
+,14,90,4,0,0,0,1,4,0,13,0,"Price #1.1.1",
,15,90,256,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index f49b90431551..8ddea41cfaab 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -2,19 +2,19 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",5
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2",5
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",5
-,301,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1","3,4"
+,301,90,256,0,0,0,1,4,0,297,0,"Regular Element #1","3,4"
,302,90,512,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,64,0,0,0,1,4,0,5,0,"Hotel #1",8
+,6,90,64,0,0,0,1,4,0,5,0,"Hotel #1",8
,7,90,256,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]",8
-,8,-1,256,0,0,0,1,4,0,3,0,"Hotel #1","5,6"
-,9,-1,128,0,0,0,1,4,0,4,0,"Hotel #2",7
+,8,90,256,0,0,0,1,4,0,3,0,"Hotel #1","5,6"
+,9,90,128,0,0,0,1,4,0,4,0,"Hotel #2",7
,10,90,32,0,0,0,1,3,0,0,3,"[MOVE-TO PLACEHOLDER for #3, WS#1]","5,6"
,11,90,64,0,0,0,1,3,0,0,4,"[MOVE-TO PLACEHOLDER for #4, WS#1]",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
@@ -23,11 +23,11 @@
,6,89,128,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,32,0,0,0,1,4,0,8,0,"Offer #1.1",13
+,9,90,32,0,0,0,1,4,0,8,0,"Offer #1.1",13
,10,90,256,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",13
-,11,-1,256,0,0,0,1,4,0,5,0,"Offer #1.1","7,8,9"
-,12,-1,128,0,0,0,1,4,0,6,0,"Offer #1.2","10,11"
-,13,-1,64,0,0,0,1,4,0,7,0,"Offer #2.1",12
+,11,90,256,0,0,0,1,4,0,5,0,"Offer #1.1","7,8,9"
+,12,90,128,0,0,0,1,4,0,6,0,"Offer #1.2","10,11"
+,13,90,64,0,0,0,1,4,0,7,0,"Offer #2.1",12
,14,90,4,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]","7,8,9"
,15,90,8,0,0,0,1,3,0,0,6,"[MOVE-TO PLACEHOLDER for #6, WS#1]","10,11"
,16,90,16,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",12
@@ -40,14 +40,14 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,4,0,0,0,1,4,0,13,0,"Price #1.1.1",
+,14,90,4,0,0,0,1,4,0,13,0,"Price #1.1.1",
,15,90,768,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",
-,16,-1,256,0,0,0,1,4,0,7,0,"Price #1.1.1",
-,17,-1,128,0,0,0,1,4,0,8,0,"Price #1.1.2",
-,18,-1,64,0,0,0,1,4,0,9,0,"Price #1.1.3",
-,19,-1,32,0,0,0,1,4,0,10,0,"Price #1.2.1",
-,20,-1,16,0,0,0,1,4,0,11,0,"Price #1.2.2",
-,21,-1,8,0,0,0,1,4,0,12,0,"Price #2.1.1",
+,16,90,256,0,0,0,1,4,0,7,0,"Price #1.1.1",
+,17,90,128,0,0,0,1,4,0,8,0,"Price #1.1.2",
+,18,90,64,0,0,0,1,4,0,9,0,"Price #1.1.3",
+,19,90,32,0,0,0,1,4,0,10,0,"Price #1.2.1",
+,20,90,16,0,0,0,1,4,0,11,0,"Price #1.2.2",
+,21,90,8,0,0,0,1,4,0,12,0,"Price #2.1.1",
,22,90,0,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",
,23,90,1,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",
,24,90,2,0,0,0,1,3,0,0,9,"[MOVE-TO PLACEHOLDER for #9, WS#1]",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index d32de2476377..1dd50528d6a8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",6
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",8
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
@@ -12,7 +12,7 @@
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,0,0,0,0,0,"Hotel #1",9
,8,89,16,1,0,0,1,1,0,0,0,"Hotel #1",11
-,9,-1,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
+,9,89,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -21,7 +21,7 @@
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,"Offer #1",
,11,89,8,1,0,0,1,1,0,0,0,"Offer #1",
-,12,-1,8,1,0,0,1,-1,0,11,0,"Offer #1",
+,12,89,8,1,0,0,1,-1,0,11,0,"Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index ed2849f116dc..5a2a3dca8bb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,1,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,1,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,1,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,1,0,0,1,-1,0,9,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index ce1a0c7a102b..42ab705d4b45 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
@@ -12,7 +12,7 @@
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,0,0,0,0,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -21,7 +21,7 @@
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv
index bfcbb8e430c0..b31c560838ef 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv
@@ -13,19 +13,19 @@
,3,89,256,1,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,1,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,1,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,1,0,0,1,2,0,3,0,"Hotel #1","5,6"
-,7,-1,128,1,0,0,1,2,0,4,0,"Hotel #2",7
-,8,-1,64,1,0,0,1,2,0,5,0,"Hotel #1",8
+,6,89,256,1,0,0,1,2,0,3,0,"Hotel #1","5,6"
+,7,89,128,1,0,0,1,2,0,4,0,"Hotel #2",7
+,8,89,64,1,0,0,1,2,0,5,0,"Hotel #1",8
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,1,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,1,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,1,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,1,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,1,0,0,1,2,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,1,0,0,1,2,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,1,0,0,1,2,0,7,0,"Offer #2.1",12
-,12,-1,32,1,0,0,1,2,0,8,0,"Offer #1.1",13
+,9,89,256,1,0,0,1,2,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,1,0,0,1,2,0,6,0,"Offer #1.2","10,11"
+,11,89,64,1,0,0,1,2,0,7,0,"Offer #2.1",12
+,12,89,32,1,0,0,1,2,0,8,0,"Offer #1.1",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,1,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -35,10 +35,10 @@
,11,89,16,1,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,1,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,1,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,1,0,0,1,2,0,7,0,"Price #1.1.1",
-,15,-1,128,1,0,0,1,2,0,8,0,"Price #1.1.2",
-,16,-1,64,1,0,0,1,2,0,9,0,"Price #1.1.3",
-,17,-1,32,1,0,0,1,2,0,10,0,"Price #1.2.1",
-,18,-1,16,1,0,0,1,2,0,11,0,"Price #1.2.2",
-,19,-1,8,1,0,0,1,2,0,12,0,"Price #2.1.1",
-,20,-1,4,1,0,0,1,2,0,13,0,"Price #1.1.1",
+,14,89,256,1,0,0,1,2,0,7,0,"Price #1.1.1",
+,15,89,128,1,0,0,1,2,0,8,0,"Price #1.1.2",
+,16,89,64,1,0,0,1,2,0,9,0,"Price #1.1.3",
+,17,89,32,1,0,0,1,2,0,10,0,"Price #1.2.1",
+,18,89,16,1,0,0,1,2,0,11,0,"Price #1.2.2",
+,19,89,8,1,0,0,1,2,0,12,0,"Price #2.1.1",
+,20,89,4,1,0,0,1,2,0,13,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 0136ee495686..c05ecb664f96 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,13 +2,13 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Testing #2","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Testing #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
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 0266722c3eed..561c745f2086 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
@@ -7,14 +7,14 @@
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,7,-1,128,0,0,0,1,2,0,4,0,"Hotel #2",7
+,7,89,128,0,0,0,1,2,0,4,0,"Hotel #2",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,11,-1,64,0,0,0,1,2,0,7,0,"Offer #2.1",12
+,11,89,64,0,0,0,1,2,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -24,4 +24,4 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,19,-1,8,0,0,0,1,2,0,12,0,"Price #2.1.1",
+,19,89,8,0,0,0,1,2,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
index c7489d2dd5b9..321f712a136f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 0497dd5a9c49..d9d21b1bab04 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
-,7,-1,128,0,0,0,1,0,0,4,0,"Testing #1",7
+,6,89,256,0,0,0,1,0,0,3,0,"Hotel #1","5,6"
+,7,89,128,0,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,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,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
+,9,89,256,0,0,0,1,0,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,0,0,0,1,0,0,6,0,"Offer #1.2","10,11"
+,11,89,64,0,0,0,1,0,0,7,0,"Offer #2.1",12
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -28,9 +28,9 @@
,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
-,15,-1,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
-,16,-1,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
-,17,-1,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
-,18,-1,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
-,19,-1,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+,14,89,256,0,0,0,1,0,0,7,0,"Price #1.1.1",
+,15,89,128,0,0,0,1,0,0,8,0,"Price #1.1.2",
+,16,89,64,0,0,0,1,0,0,9,0,"Price #1.1.3",
+,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
+,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
+,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index d32de2476377..1dd50528d6a8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",6
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",8
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
@@ -12,7 +12,7 @@
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,0,0,0,0,0,"Hotel #1",9
,8,89,16,1,0,0,1,1,0,0,0,"Hotel #1",11
-,9,-1,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
+,9,89,16,1,0,0,1,-1,0,8,0,"Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -21,7 +21,7 @@
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,"Offer #1",
,11,89,8,1,0,0,1,1,0,0,0,"Offer #1",
-,12,-1,8,1,0,0,1,-1,0,11,0,"Offer #1",
+,12,89,8,1,0,0,1,-1,0,11,0,"Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index ed2849f116dc..5a2a3dca8bb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,18 +3,18 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",6
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",6
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,1,0,0,1,1,0,0,0,"Hotel #1",9
-,7,-1,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
+,7,89,32,1,0,0,1,-1,0,6,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -22,9 +22,9 @@
,7,89,64,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,1,0,0,1,1,0,0,0,"Offer #1",
-,10,-1,16,1,0,0,1,-1,0,9,0,"Offer #1",
+,10,89,16,1,0,0,1,-1,0,9,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index ce1a0c7a102b..42ab705d4b45 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",6
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",8
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",8
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
@@ -12,7 +12,7 @@
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,0,0,0,0,0,0,0,"Hotel #1",9
,8,89,48,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",11
-,9,-1,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
+,9,89,48,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",11
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
@@ -21,7 +21,7 @@
,8,89,32,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,"Offer #1",
,11,89,24,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",
-,12,-1,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
+,12,89,24,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv
index bfcbb8e430c0..b31c560838ef 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv
@@ -13,19 +13,19 @@
,3,89,256,1,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,1,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,1,0,0,0,0,0,0,0,"Hotel #1",8
-,6,-1,256,1,0,0,1,2,0,3,0,"Hotel #1","5,6"
-,7,-1,128,1,0,0,1,2,0,4,0,"Hotel #2",7
-,8,-1,64,1,0,0,1,2,0,5,0,"Hotel #1",8
+,6,89,256,1,0,0,1,2,0,3,0,"Hotel #1","5,6"
+,7,89,128,1,0,0,1,2,0,4,0,"Hotel #2",7
+,8,89,64,1,0,0,1,2,0,5,0,"Hotel #1",8
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,1,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,1,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,1,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,1,0,0,0,0,0,0,0,"Offer #1.1",13
-,9,-1,256,1,0,0,1,2,0,5,0,"Offer #1.1","7,8,9"
-,10,-1,128,1,0,0,1,2,0,6,0,"Offer #1.2","10,11"
-,11,-1,64,1,0,0,1,2,0,7,0,"Offer #2.1",12
-,12,-1,32,1,0,0,1,2,0,8,0,"Offer #1.1",13
+,9,89,256,1,0,0,1,2,0,5,0,"Offer #1.1","7,8,9"
+,10,89,128,1,0,0,1,2,0,6,0,"Offer #1.2","10,11"
+,11,89,64,1,0,0,1,2,0,7,0,"Offer #2.1",12
+,12,89,32,1,0,0,1,2,0,8,0,"Offer #1.1",13
"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,1,0,0,0,0,0,0,0,"Price #1.1.1",
@@ -35,10 +35,10 @@
,11,89,16,1,0,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,1,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,1,0,0,0,0,0,0,0,"Price #1.1.1",
-,14,-1,256,1,0,0,1,2,0,7,0,"Price #1.1.1",
-,15,-1,128,1,0,0,1,2,0,8,0,"Price #1.1.2",
-,16,-1,64,1,0,0,1,2,0,9,0,"Price #1.1.3",
-,17,-1,32,1,0,0,1,2,0,10,0,"Price #1.2.1",
-,18,-1,16,1,0,0,1,2,0,11,0,"Price #1.2.2",
-,19,-1,8,1,0,0,1,2,0,12,0,"Price #2.1.1",
-,20,-1,4,1,0,0,1,2,0,13,0,"Price #1.1.1",
+,14,89,256,1,0,0,1,2,0,7,0,"Price #1.1.1",
+,15,89,128,1,0,0,1,2,0,8,0,"Price #1.1.2",
+,16,89,64,1,0,0,1,2,0,9,0,"Price #1.1.3",
+,17,89,32,1,0,0,1,2,0,10,0,"Price #1.2.1",
+,18,89,16,1,0,0,1,2,0,11,0,"Price #1.2.2",
+,19,89,8,1,0,0,1,2,0,12,0,"Price #2.1.1",
+,20,89,4,1,0,0,1,2,0,13,0,"Price #1.1.1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 0136ee495686..c05ecb664f96 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,13 +2,13 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Testing #2","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Testing #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
index 9619bb6a41f0..a04d8030209e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,13 +2,13 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,"Hotel #1",8
-,7,-1,128,1,0,0,1,0,0,4,0,"Testing #1",7
+,7,89,128,1,0,0,1,0,0,4,0,"Testing #1",7
"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 7ef23250491d..8a82993641ec 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,7 +2,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",5
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
+,299,89,256,1,0,0,1,0,0,297,0,"Regular Element #1","3,4"
"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,3,89,256,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
index 5d68dd9c212b..b2d3df221a3a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
@@ -2,7 +2,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1",2,,,
+,299,89,256,0,0,0,1,4,0,297,0,"Regular Element #1",2,,,
,300,89,768,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]",0,,,
"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"
@@ -10,17 +10,17 @@
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,0,0,0,1,0,0,4,0,"Hotel #2",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,0,0,0,1,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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -30,9 +30,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
index 175a720d420f..221682f4ddbb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
@@ -5,15 +5,15 @@
,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
,90,88,512,0,0,0,0,0,0,"Target",0,,,,,
,91,90,256,0,1,1,0,0,0,"Relations",0,,,,,
-,92,-1,256,0,1,-1,0,91,0,"Relations",1,,,,,
+,92,90,256,0,1,-1,0,91,0,"Relations",1,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",0,,,
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
+,300,91,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
,301,91,128,0,0,0,1,1,0,0,0,"Regular Element #1",0,,,
-,302,-1,128,0,0,0,1,-1,0,301,0,"Regular Element #1",2,,,
+,302,91,128,0,0,0,1,-1,0,301,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -21,13 +21,13 @@
,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,1,0,0,0,1,1,0,0,0,"Hotel #0",91,"pages",,0
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #0",91,"pages",,0
+,7,91,256,0,0,0,1,-1,0,6,0,"Hotel #0",91,"pages",,0
,8,91,513,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,9,-1,256,0,0,0,1,-1,0,8,0,"Hotel #1",299,"tt_content",,1
+,9,91,256,0,0,0,1,-1,0,8,0,"Hotel #1",299,"tt_content",,1
,10,91,1,0,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,11,-1,0,0,0,0,1,-1,0,10,0,"Hotel #1",301,"tt_content",,2
+,11,91,0,0,0,0,1,-1,0,10,0,"Hotel #1",301,"tt_content",,2
,12,91,2,0,0,0,1,1,0,0,0,"Hotel #2",301,"tt_content",,0
-,13,-1,256,0,0,0,1,-1,0,12,0,"Hotel #2",301,"tt_content",,1
+,13,91,256,0,0,0,1,-1,0,12,0,"Hotel #2",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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -35,13 +35,13 @@
,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,513,0,0,0,1,1,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,0
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1
+,10,91,256,0,0,0,1,-1,0,9,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1
,11,91,1,0,0,0,1,1,0,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,0,0,0,1,-1,0,11,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,3
+,12,91,0,0,0,0,1,-1,0,11,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,3
,13,91,2,0,0,0,1,1,0,0,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,0
-,14,-1,256,0,0,0,1,-1,0,13,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,2
+,14,91,256,0,0,0,1,-1,0,13,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,2
,15,91,1,0,0,0,1,1,0,0,0,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,0
-,16,-1,0,0,0,0,1,-1,0,15,0,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,1
+,16,91,0,0,0,0,1,-1,0,15,0,"Offer #2.1",12,"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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -52,16 +52,16 @@
,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,1025,0,0,0,1,1,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,15,91,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
,16,91,513,0,0,0,1,1,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
-,17,-1,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
+,17,91,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
,18,91,514,0,0,0,1,1,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
-,19,-1,256,0,0,0,1,-1,0,18,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
+,19,91,256,0,0,0,1,-1,0,18,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
,20,91,515,0,0,0,1,1,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
-,21,-1,128,0,0,0,1,-1,0,20,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
+,21,91,128,0,0,0,1,-1,0,20,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
,22,91,1,0,0,0,1,1,0,0,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
-,23,-1,0,0,0,0,1,-1,0,22,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
+,23,91,0,0,0,0,1,-1,0,22,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
,24,91,2,0,0,0,1,1,0,0,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
-,25,-1,256,0,0,0,1,-1,0,24,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
+,25,91,256,0,0,0,1,-1,0,24,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
,26,91,1,0,0,0,1,1,0,0,0,"Price #2.1.1",15,"tx_irretutorial_1nff_offer",,
-,27,-1,0,0,0,0,1,-1,0,26,0,"Price #2.1.1",15,"tx_irretutorial_1nff_offer",,
+,27,91,0,0,0,0,1,-1,0,26,0,"Price #2.1.1",15,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index ca9fc0cb05e1..223f8638b715 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -5,15 +5,15 @@
,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
,90,88,512,0,0,0,0,0,0,"Target",0,,,,,
,91,90,256,0,1,1,0,0,0,"Relations",0,,,,,
-,92,-1,256,0,1,-1,0,91,0,"Relations",1,,,,,
+,92,90,256,0,1,-1,0,91,0,"Relations",1,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",0,,,
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
+,300,91,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
,301,91,128,0,0,0,1,1,0,0,0,"Regular Element #1",0,,,
-,302,-1,128,0,0,0,1,-1,0,301,0,"Regular Element #1",2,,,
+,302,91,128,0,0,0,1,-1,0,301,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -21,13 +21,13 @@
,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,1,0,0,0,1,1,0,0,0,"Hotel #0",91,"pages",,0
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #0",91,"pages",,0
+,7,91,256,0,0,0,1,-1,0,6,0,"Hotel #0",91,"pages",,0
,8,91,2,0,0,0,1,1,0,0,0,"Hotel #2",301,"tt_content",,0
-,9,-1,256,0,0,0,1,-1,0,8,0,"Hotel #2",301,"tt_content",,1
+,9,91,256,0,0,0,1,-1,0,8,0,"Hotel #2",301,"tt_content",,1
,10,91,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,11,-1,128,0,0,0,1,-1,0,10,0,"Hotel #1",299,"tt_content",,1
+,11,91,128,0,0,0,1,-1,0,10,0,"Hotel #1",299,"tt_content",,1
,12,91,1,0,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,13,-1,64,0,0,0,1,-1,0,12,0,"Hotel #1",301,"tt_content",,2
+,13,91,64,0,0,0,1,-1,0,12,0,"Hotel #1",301,"tt_content",,2
"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
@@ -35,13 +35,13 @@
,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,513,0,0,0,1,1,0,0,0,"Offer #2.1",8,"tx_irretutorial_1nff_hotel",,0
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #2.1",8,"tx_irretutorial_1nff_hotel",,1
+,10,91,256,0,0,0,1,-1,0,9,0,"Offer #2.1",8,"tx_irretutorial_1nff_hotel",,1
,11,91,513,0,0,0,1,1,0,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,0,0,0,1,-1,0,11,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,1
+,12,91,0,0,0,0,1,-1,0,11,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,1
,13,91,1,0,0,0,1,1,0,0,0,"Offer #1.1",12,"tx_irretutorial_1nff_hotel",,0
-,14,-1,0,0,0,0,1,-1,0,13,0,"Offer #1.1",12,"tx_irretutorial_1nff_hotel",,3
+,14,91,0,0,0,0,1,-1,0,13,0,"Offer #1.1",12,"tx_irretutorial_1nff_hotel",,3
,15,91,2,0,0,0,1,1,0,0,0,"Offer #1.2",12,"tx_irretutorial_1nff_hotel",,0
-,16,-1,256,0,0,0,1,-1,0,15,0,"Offer #1.2",12,"tx_irretutorial_1nff_hotel",,2
+,16,91,256,0,0,0,1,-1,0,15,0,"Offer #1.2",12,"tx_irretutorial_1nff_hotel",,2
"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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -52,16 +52,16 @@
,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,1025,0,0,0,1,1,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
+,15,91,256,0,0,0,1,-1,0,14,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
,16,91,1025,0,0,0,1,1,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
-,17,-1,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
+,17,91,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
,18,91,513,0,0,0,1,1,0,0,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
-,19,-1,0,0,0,0,1,-1,0,18,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
+,19,91,0,0,0,0,1,-1,0,18,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
,20,91,514,0,0,0,1,1,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
-,21,-1,256,0,0,0,1,-1,0,20,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
+,21,91,256,0,0,0,1,-1,0,20,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
,22,91,515,0,0,0,1,1,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
-,23,-1,128,0,0,0,1,-1,0,22,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
+,23,91,128,0,0,0,1,-1,0,22,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
,24,91,1,0,0,0,1,1,0,0,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
-,25,-1,0,0,0,0,1,-1,0,24,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
+,25,91,0,0,0,0,1,-1,0,24,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
,26,91,2,0,0,0,1,1,0,0,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,
-,27,-1,256,0,0,0,1,-1,0,26,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,
+,27,91,256,0,0,0,1,-1,0,26,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
index 22d708273d80..dc0f2adb9570 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
@@ -3,7 +3,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -11,7 +11,7 @@
,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,0,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,0,0,0,0,1,-1,0,6,0,"Hotel #1",299,"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
@@ -19,7 +19,7 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,0,0,0,0,1,-1,0,9,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
+,10,89,0,0,0,0,1,-1,0,9,0,"Offer #1.1",6,"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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -30,4 +30,4 @@
,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,89,1,0,0,0,1,1,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,-1,0,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,15,89,0,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
index d62e1dc69d9f..48fef07379d6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,90,256,0,0,0,1,1,0,0,0,"Regular Element #2",0,,,
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
+,300,90,256,0,0,0,1,-1,0,299,0,"Regular Element #2",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -17,7 +17,7 @@
,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,90,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,256,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,90,256,0,0,0,1,-1,0,6,0,"Hotel #1",299,"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
@@ -25,7 +25,7 @@
,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,90,1,0,0,0,1,1,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,256,0,0,0,1,-1,0,9,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
+,10,90,256,0,0,0,1,-1,0,9,0,"Offer #1.1",6,"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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -36,4 +36,4 @@
,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,90,1,0,0,0,1,1,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,15,90,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 52ab6ff45d29..743ce4fc309a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,64,0,0,0,1,1,0,0,0,"Testing #1 (copy 1)",0,,,
-,302,-1,64,0,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
+,302,89,64,0,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,0,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,9,-1,0,0,0,0,1,-1,0,8,0,"Hotel #1",301,"tt_content",,1
+,9,89,0,0,0,0,1,-1,0,8,0,"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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,0,0,0,1,1,0,0,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,0,0,0,1,-1,0,11,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,0,0,0,0,1,-1,0,11,0,"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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index 3c7288e537ec..e63dce8b8942 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",0,,,
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,9,-1,0,1,0,0,1,-1,0,8,0,"Hotel #1",301,"tt_content",,1
+,9,89,0,1,0,0,1,-1,0,8,0,"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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,0,0,1,1,0,0,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,1,0,0,1,-1,0,11,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,0,1,0,0,1,-1,0,11,0,"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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index 9c6544c6afd4..58cd648c2319 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,4,89,514,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,89,1,1,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,1,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index 1b0ee7720814..90863d0008ca 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,4,89,514,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 6077fad3f223..d59b0b961db5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,0,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,4,89,514,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,0,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,0,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,0,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,0,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,0,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,0,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 5b64ab44158f..6beef02a17b1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,0,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,0,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,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,89,0,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,0,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,0,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,0,0,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,0,0,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,0,0,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,0,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,0,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,0,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
index 29c6d25fc28e..1c3b820742c4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
@@ -3,4 +3,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index 40271136e2c2..ebd81c03a7be 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -3,7 +3,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -11,7 +11,7 @@
,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,89,1,0,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,0,0,0,1,-1,0,6,0,"Hotel #1",299,"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
@@ -19,7 +19,7 @@
,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,89,1,0,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,0,0,0,1,-1,0,9,0,"Offer #1",6,"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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
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 8f664e8bf126..0b3933955826 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
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
,90,88,512,0,0,0,0,0,0,"Target",0,,,,,
-,91,-1,256,0,1,2,0,89,0,"Relations",1,,,,,
+,91,88,256,0,1,2,0,89,0,"Relations",1,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
@@ -15,7 +15,7 @@
,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,-1,1,0,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
+,6,89,1,0,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
"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
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 7fd16f0cea06..7d0b9525a8a2 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
@@ -2,21 +2,21 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",1,,,
+,299,89,512,0,0,0,1,2,0,298,0,"Regular Element #2",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,2,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,89,1,0,0,0,1,2,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,2,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,2,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -26,4 +26,4 @@
,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,-1,1,0,0,0,1,2,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,2,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index f9e71c530996..9c5de63c11f4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -3,7 +3,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",0,,,
-,300,-1,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",1,,,
+,300,89,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -11,7 +11,7 @@
,4,89,514,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,89,1,0,1,5,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,0
-,7,-1,257,0,1,5,1,-1,0,6,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1
+,7,89,257,0,1,5,1,-1,0,6,0,"[Translate to Dansk:] Hotel #1",299,"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
@@ -19,7 +19,7 @@
,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,89,1,0,1,8,1,1,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,257,0,1,8,1,-1,0,9,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
+,10,89,257,0,1,8,1,-1,0,9,0,"[Translate to Dansk:] Offer #1.1",6,"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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -30,4 +30,4 @@
,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,89,1,0,1,13,1,1,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,-1,257,0,1,13,1,-1,0,14,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,15,89,257,0,1,13,1,-1,0,14,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 90343b56ac3d..2c983759d251 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,26 +2,26 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1",2,,,
-,300,-1,256,0,0,0,1,0,0,297,0,"Testing #2",2,,,
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #1",2,,,
+,300,89,256,0,0,0,1,0,0,297,0,"Testing #2",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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
-,8,-1,2,0,0,0,1,0,0,4,0,"Testing #2",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,8,89,2,0,0,0,1,0,0,4,0,"Testing #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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -31,9 +31,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
index 233c4343d146..cbc69653dccb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -8,14 +8,14 @@
,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,-1,2,0,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,2,0,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -25,4 +25,4 @@
,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,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
index 0dc45607894f..3eb0fcb7227b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
,90,88,512,0,0,0,0,0,0,"Target",0,,,,,
-,91,-1,256,0,1,0,0,89,0,"Testing #1",1,,,,,
+,91,88,256,0,1,0,0,89,0,"Testing #1",1,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
@@ -15,7 +15,7 @@
,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,-1,1,0,0,0,1,0,0,2,0,"Hotel #0",89,"pages",,0
+,6,89,1,0,0,0,1,0,0,2,0,"Hotel #0",89,"pages",,0
"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
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
index bdb44c1b2dd2..50e31d88ebb8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
@@ -2,21 +2,21 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,512,0,0,0,1,0,0,298,0,"Testing #1",1,,,
+,299,89,512,0,0,0,1,0,0,298,0,"Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,89,1,0,0,0,1,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -26,4 +26,4 @@
,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,-1,1,0,0,0,1,0,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
index bfc805e11216..6b63de0b0db8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -2,23 +2,23 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,512,0,0,0,1,0,0,298,0,"Regular Element #2",2,,,
+,299,89,512,0,0,0,1,0,0,298,0,"Regular Element #2",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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,5,0,"Hotel #1",298,"tt_content",,1
,7,89,2,0,0,0,1,1,0,0,0,"Hotel #2",298,"tt_content",,0
-,8,-1,2,0,0,0,1,-1,0,7,0,"Hotel #2",298,"tt_content",,0
+,8,89,2,0,0,0,1,-1,0,7,0,"Hotel #2",298,"tt_content",,0
"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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -28,4 +28,4 @@
,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,-1,1,0,0,0,1,0,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 52140f38fd8b..f879841077ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,0,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,2,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,1,0,0,0,1,0,0,4,0,"Hotel #2",297,"tt_content",,1
+,6,89,2,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,1,0,0,0,1,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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
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 514dec715fbd..828e94c684ae 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
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",1,,,
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,0,0,0,1,2,0,4,0,"Hotel #2",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,0,0,0,1,2,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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,2,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,2,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
index 1b0bbf35168f..52497f93dba2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,0,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,0,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,0,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
index 31b5aae46dce..c8f2f46c78a5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 1e1c3d714f43..6b47414cceac 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,0,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,0,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
index 5728f1fe9c2c..4f9057891369 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -2,7 +2,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",1,,,
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2",1,,,
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",0,,,
"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"
@@ -10,7 +10,7 @@
,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,-1,1,0,0,0,1,4,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,90,1,0,0,0,1,4,0,5,0,"Hotel #1",298,"tt_content",,1
,7,90,256,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]",298,"tt_content",,0
"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"
@@ -18,7 +18,7 @@
,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,-1,1,0,0,0,1,4,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,90,1,0,0,0,1,4,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,10,90,256,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",5,"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",
@@ -29,5 +29,5 @@
,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,-1,1,0,0,0,1,4,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,90,1,0,0,0,1,4,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,15,90,256,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",8,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 04c1bdda5213..8de115172a21 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -2,9 +2,9 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",1,,,
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2",1,,,
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",0,,,
-,301,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1",2,,,
+,301,90,256,0,0,0,1,4,0,297,0,"Regular Element #1",2,,,
,302,90,512,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]",0,,,
"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"
@@ -12,10 +12,10 @@
,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,-1,1,0,0,0,1,4,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,90,1,0,0,0,1,4,0,5,0,"Hotel #1",298,"tt_content",,1
,7,90,256,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]",298,"tt_content",,0
-,8,-1,1,0,0,0,1,4,0,3,0,"Hotel #1",297,"tt_content",,2
-,9,-1,2,0,0,0,1,4,0,4,0,"Hotel #2",297,"tt_content",,1
+,8,90,1,0,0,0,1,4,0,3,0,"Hotel #1",297,"tt_content",,2
+,9,90,2,0,0,0,1,4,0,4,0,"Hotel #2",297,"tt_content",,1
,10,90,128,0,0,0,1,3,0,0,3,"[MOVE-TO PLACEHOLDER for #3, WS#1]",297,"tt_content",,0
,11,90,64,0,0,0,1,3,0,0,4,"[MOVE-TO PLACEHOLDER for #4, WS#1]",297,"tt_content",,0
"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
@@ -24,11 +24,11 @@
,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,-1,1,0,0,0,1,4,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,90,1,0,0,0,1,4,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,10,90,256,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",5,"tx_irretutorial_1nff_hotel",,0
-,11,-1,1,0,0,0,1,4,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,12,-1,2,0,0,0,1,4,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,13,-1,1,0,0,0,1,4,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,11,90,1,0,0,0,1,4,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,12,90,2,0,0,0,1,4,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,13,90,1,0,0,0,1,4,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
,14,90,128,0,0,0,1,3,0,0,5,"[MOVE-TO PLACEHOLDER for #5, WS#1]",3,"tx_irretutorial_1nff_hotel",,0
,15,90,64,0,0,0,1,3,0,0,6,"[MOVE-TO PLACEHOLDER for #6, WS#1]",3,"tx_irretutorial_1nff_hotel",,0
,16,90,32,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",4,"tx_irretutorial_1nff_hotel",,0
@@ -41,14 +41,14 @@
,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,-1,1,0,0,0,1,4,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,90,1,0,0,0,1,4,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,15,90,256,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",8,"tx_irretutorial_1nff_offer",,
-,16,-1,1,0,0,0,1,4,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,17,-1,2,0,0,0,1,4,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,18,-1,3,0,0,0,1,4,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,4,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,20,-1,2,0,0,0,1,4,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,21,-1,1,0,0,0,1,4,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,16,90,1,0,0,0,1,4,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,17,90,2,0,0,0,1,4,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,18,90,3,0,0,0,1,4,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,19,90,1,0,0,0,1,4,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,20,90,2,0,0,0,1,4,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,21,90,1,0,0,0,1,4,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,22,90,128,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",5,"tx_irretutorial_1nff_offer",,
,23,90,64,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",5,"tx_irretutorial_1nff_offer",,
,24,90,32,0,0,0,1,3,0,0,9,"[MOVE-TO PLACEHOLDER for #9, WS#1]",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index f09c54b9bd3f..1b5ceda2bb05 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",0,,,
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,7 +13,7 @@
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,9,-1,0,1,0,0,1,-1,0,8,0,"Hotel #1",301,"tt_content",,1
+,9,89,0,1,0,0,1,-1,0,8,0,"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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -22,7 +22,7 @@
,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,0,0,1,1,0,0,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,1,0,0,1,-1,0,11,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,0,1,0,0,1,-1,0,11,0,"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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index 9c6544c6afd4..58cd648c2319 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,4,89,514,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,89,1,1,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,1,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index c26cbe92d9c8..ecbc97b07bce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,7 +13,7 @@
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -22,7 +22,7 @@
,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
index cf8cd6635032..be1aca140a9d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
@@ -14,20 +14,20 @@
,3,89,1,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,-1,1,1,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
-,7,-1,1,1,0,0,1,2,0,3,0,"Hotel #1",297,"tt_content",,2
-,8,-1,2,1,0,0,1,2,0,4,0,"Hotel #2",297,"tt_content",,1
-,9,-1,1,1,0,0,1,2,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,89,1,1,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
+,7,89,1,1,0,0,1,2,0,3,0,"Hotel #1",297,"tt_content",,2
+,8,89,2,1,0,0,1,2,0,4,0,"Hotel #2",297,"tt_content",,1
+,9,89,1,1,0,0,1,2,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,1,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,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
,7,89,1,1,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,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,1,0,0,1,2,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,1,0,0,1,2,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,1,0,0,1,2,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,12,-1,1,1,0,0,1,2,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,1,0,0,1,2,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,1,0,0,1,2,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,1,0,0,1,2,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,12,89,1,1,0,0,1,2,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",
,7,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -37,10 +37,10 @@
,11,89,2,1,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,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,-1,1,1,0,0,1,2,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,1,0,0,1,2,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,1,0,0,1,2,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,1,0,0,1,2,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,1,0,0,1,2,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,1,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,20,-1,1,1,0,0,1,2,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,89,1,1,0,0,1,2,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,1,0,0,1,2,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,1,0,0,1,2,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,1,0,0,1,2,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,1,0,0,1,2,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,1,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,20,89,1,1,0,0,1,2,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/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 830a071b3583..4525116709cf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,14 +2,14 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Testing #2",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1",2,,,
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,"Testing #2",297,"tt_content",,1
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",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,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
index 31b5aae46dce..c8f2f46c78a5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 1e1c3d714f43..6b47414cceac 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,24 +2,24 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,-1,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
-,7,-1,2,0,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,6,89,1,0,0,0,1,0,0,3,0,"Hotel #1",297,"tt_content",,2
+,7,89,2,0,0,0,1,0,0,4,0,"Testing #1",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,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,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,0,0,0,1,0,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,0,0,0,1,0,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,0,0,0,1,0,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,0,0,0,1,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,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -29,9 +29,9 @@
,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,-1,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,14,89,1,0,0,0,1,0,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,0,0,0,1,0,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,0,0,0,1,0,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,0,0,0,1,0,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,0,0,0,1,0,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,0,0,0,1,0,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
index f09c54b9bd3f..1b5ceda2bb05 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
,301,89,64,1,0,0,1,1,0,0,0,"Testing #1 (copy 1)",0,,,
-,302,-1,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
+,302,89,64,1,0,0,1,-1,0,301,0,"Testing #1 (copy 1)",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,7 +13,7 @@
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,0,0,1,1,0,0,0,"Hotel #1",301,"tt_content",,0
-,9,-1,0,1,0,0,1,-1,0,8,0,"Hotel #1",301,"tt_content",,1
+,9,89,0,1,0,0,1,-1,0,8,0,"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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -22,7 +22,7 @@
,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,0,0,1,1,0,0,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,0,1,0,0,1,-1,0,11,0,"Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,0,1,0,0,1,-1,0,11,0,"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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
index 9c6544c6afd4..58cd648c2319 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -3,9 +3,9 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,1,0,0,1,1,0,0,0,"Testing #1",0,,,
-,300,-1,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
+,300,89,128,1,0,0,1,-1,0,299,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,9 +13,9 @@
,4,89,514,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,89,1,1,0,0,1,1,0,0,0,"Hotel #1",299,"tt_content",,0
-,7,-1,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
+,7,89,1,1,0,0,1,-1,0,6,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -23,9 +23,9 @@
,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,89,1,1,0,0,1,1,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,-1,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
+,10,89,1,1,0,0,1,-1,0,9,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index c26cbe92d9c8..ecbc97b07bce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -4,7 +4,7 @@
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
,301,89,192,1,1,299,1,1,0,0,0,"[Translate to Dansk:] Testing #1",0,,,
-,302,-1,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
+,302,89,192,1,1,299,1,-1,0,301,0,"[Translate to Dansk:] Testing #1",1,,,
"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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
@@ -13,7 +13,7 @@
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
,8,89,1,1,1,6,1,1,0,0,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,0
-,9,-1,257,1,1,6,1,-1,0,8,0,"[Translate to Dansk:] Hotel #1",301,"tt_content",,1
+,9,89,257,1,1,6,1,-1,0,8,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"
,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
@@ -22,7 +22,7 @@
,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
,11,89,1,1,1,9,1,1,0,0,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
-,12,-1,257,1,1,9,1,-1,0,11,0,"[Translate to Dansk:] Offer #1",8,"tx_irretutorial_1nff_hotel",,0
+,12,89,257,1,1,9,1,-1,0,11,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",
,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
index cf8cd6635032..be1aca140a9d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
@@ -14,20 +14,20 @@
,3,89,1,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,-1,1,1,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
-,7,-1,1,1,0,0,1,2,0,3,0,"Hotel #1",297,"tt_content",,2
-,8,-1,2,1,0,0,1,2,0,4,0,"Hotel #2",297,"tt_content",,1
-,9,-1,1,1,0,0,1,2,0,5,0,"Hotel #1",298,"tt_content",,1
+,6,89,1,1,0,0,1,2,0,2,0,"Hotel #0",89,"pages",,0
+,7,89,1,1,0,0,1,2,0,3,0,"Hotel #1",297,"tt_content",,2
+,8,89,2,1,0,0,1,2,0,4,0,"Hotel #2",297,"tt_content",,1
+,9,89,1,1,0,0,1,2,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,1,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,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
,7,89,1,1,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,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,-1,1,1,0,0,1,2,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,10,-1,2,1,0,0,1,2,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,11,-1,1,1,0,0,1,2,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,12,-1,1,1,0,0,1,2,0,8,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
+,9,89,1,1,0,0,1,2,0,5,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
+,10,89,2,1,0,0,1,2,0,6,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
+,11,89,1,1,0,0,1,2,0,7,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
+,12,89,1,1,0,0,1,2,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",
,7,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
@@ -37,10 +37,10 @@
,11,89,2,1,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,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,-1,1,1,0,0,1,2,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,15,-1,2,1,0,0,1,2,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,16,-1,3,1,0,0,1,2,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,17,-1,1,1,0,0,1,2,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,18,-1,2,1,0,0,1,2,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,19,-1,1,1,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,20,-1,1,1,0,0,1,2,0,13,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,14,89,1,1,0,0,1,2,0,7,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
+,15,89,2,1,0,0,1,2,0,8,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
+,16,89,3,1,0,0,1,2,0,9,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
+,17,89,1,1,0,0,1,2,0,10,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
+,18,89,2,1,0,0,1,2,0,11,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
+,19,89,1,1,0,0,1,2,0,12,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
+,20,89,1,1,0,0,1,2,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/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 830a071b3583..4525116709cf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -2,14 +2,14 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Testing #2",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Testing #1",2,,,
+,299,89,256,1,0,0,1,0,0,297,0,"Testing #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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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,"Testing #2",297,"tt_content",,1
,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",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,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
index 3d52a64080c0..987d1ae0bab3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardAll.csv
@@ -2,14 +2,14 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
,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
-,7,-1,2,1,0,0,1,0,0,4,0,"Testing #1",297,"tt_content",,1
+,7,89,2,1,0,0,1,0,0,4,0,"Testing #1",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,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
index 13c022b6a198..c66a96cb26f2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChildNDiscardModifiedParent.csv
@@ -2,7 +2,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",2,,,
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,-1,256,1,0,0,1,0,0,297,0,"Regular Element #1",2,,,
+,299,89,256,1,0,0,1,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"
,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
index 0194a099e414..b1de864909c0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
@@ -17,4 +17,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,3
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,3
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
index 95737a4625f8..e130100f2a17 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
@@ -16,4 +16,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,2
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
index ce2f734f7fea..7d010a02a805 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Category A (copy 1)",0,1
-,33,-1,128,0,0,0,1,-1,0,32,0,"Category A (copy 1)",0,1
+,33,0,128,0,0,0,1,-1,0,32,0,"Category A (copy 1)",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
index c34f68bf4d15..79c39fd4d0b3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
@@ -17,4 +17,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",0,2
-,300,-1,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",0,2
+,300,89,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
index 23516d3b3306..b2ce4e74e7ca 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,"Relations",,,,
,90,88,512,0,0,0,0,0,0,"Target",,,,
,91,90,256,0,1,1,0,0,0,"Relations",,,,
-,92,-1,256,0,1,-1,0,91,0,"Relations",,,,
+,92,90,256,0,1,-1,0,91,0,"Relations",,,,
"sys_category",,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parent","items"
,28,0,256,0,0,0,0,0,0,0,0,"Category A",0,0
@@ -27,6 +27,6 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",0,2
-,300,-1,256,0,0,0,1,-1,0,299,0,"Regular Element #2",0,2
+,300,91,256,0,0,0,1,-1,0,299,0,"Regular Element #2",0,2
,301,91,128,0,0,0,1,1,0,0,0,"Regular Element #1",0,2
-,302,-1,128,0,0,0,1,-1,0,301,0,"Regular Element #1",0,2
+,302,91,128,0,0,0,1,-1,0,301,0,"Regular Element #1",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNAddRelation.csv
index 2531e9e94df4..6ad186cf0103 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNAddRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Testing #1",0,1
-,33,-1,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
+,33,0,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNCreateRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNCreateRelation.csv
index a4188e5e7c45..1e9472990cd3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNCreateRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryNCreateRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,33,-1,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
+,33,0,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
@@ -18,4 +18,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0,0
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryWContentNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryWContentNAddRelation.csv
index a4188e5e7c45..1e9472990cd3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryWContentNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createCategoryWContentNAddRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,33,-1,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
+,33,0,128,0,0,0,1,-1,0,32,0,"Testing #1",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
@@ -18,4 +18,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0,0
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNAddRelation.csv
index c1ffeb527244..380fc76c049e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNAddRelation.csv
@@ -16,4 +16,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,1
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNCreateRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNCreateRelation.csv
index e015370b731e..091bafefc2fb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNCreateRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentNCreateRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,33,-1,128,0,0,0,1,-1,0,32,0,"Testing #1",0,0
+,33,0,128,0,0,0,1,-1,0,32,0,"Testing #1",0,0
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
@@ -18,4 +18,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentWCategoryNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentWCategoryNAddRelation.csv
index e015370b731e..091bafefc2fb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentWCategoryNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/createContentWCategoryNAddRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,33,-1,128,0,0,0,1,-1,0,32,0,"Testing #1",0,0
+,33,0,128,0,0,0,1,-1,0,32,0,"Testing #1",0,0
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
@@ -18,4 +18,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",0,0
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",0,1
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 819c47d534df..695bd84b0b78 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
@@ -4,7 +4,7 @@
,29,0,512,0,0,0,0,0,0,0,0,"Category B",0,0
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
-,32,-1,256,0,0,0,1,2,0,28,0,"Category A",0,1
+,32,0,256,0,0,0,1,2,0,28,0,"Category A",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
index beb31556be17..ef86a7cb27ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
@@ -15,4 +15,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,1
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
index b79243aab6fc..ac767de5ad0e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
@@ -16,4 +16,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",0,2
+,299,89,512,0,0,0,1,2,0,298,0,"Regular Element #2",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
index 1c650253c030..8e32c0915648 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
@@ -5,7 +5,7 @@
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
,32,0,384,0,1,28,1,1,0,0,0,"[Translate to Dansk:] Category A",0,1
-,33,-1,384,0,1,28,1,-1,0,32,0,"[Translate to Dansk:] Category A",0,1
+,33,0,384,0,1,28,1,-1,0,32,0,"[Translate to Dansk:] Category A",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
index fb7c6b0953cf..2e5b2cfcf7a5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
@@ -17,4 +17,4 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",0,2
-,300,-1,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",0,2
+,300,89,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
index 8bd525593296..7d83877b0d3e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
@@ -4,7 +4,7 @@
,29,0,512,0,0,0,0,0,0,0,0,"Category B",0,0
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
-,32,-1,256,0,0,0,1,0,0,28,0,"Testing #1",0,1
+,32,0,256,0,0,0,1,0,0,28,0,"Testing #1",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
@@ -17,4 +17,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1",0,2
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
index 165a020c96b8..25f414ff0fc5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
@@ -4,7 +4,7 @@
,29,0,512,0,0,0,0,0,0,0,0,"Category B",0,0
,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0
,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0
-,32,-1,256,0,0,0,1,0,0,28,0,"Testing #1",0,1
+,32,0,256,0,0,0,1,0,0,28,0,"Testing #1",0,1
"sys_category_record_mm",,,,,,,,,,,,,,
,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname",,,,,,,,
,28,297,"tt_content",0,1,"categories",,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
index b727a589513e..d372c4da48b6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
@@ -16,4 +16,4 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1",0,2
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1",0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index 82f48d094789..eca307a911f3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -16,5 +16,5 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","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,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,2
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,2
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/VersionDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/VersionDefaultElements.csv
index e61c978a7e6b..f8bd8b88d63b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/VersionDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/VersionDefaultElements.csv
@@ -1,3 +1,3 @@
"tt_content",,,,,,,,,,,,,,,
,"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","bodytext"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2",
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
index 550aa4046339..548dfac1df83 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
@@ -10,10 +10,10 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,322,89,640,0,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
-,323,-1,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyDraftPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyDraftPage.csv
index 989d2a256e4b..2c9b15279659 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyDraftPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyDraftPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,90,256,0,89,1,1,0,0,0,"Relations",,,
-,92,-1,256,0,89,1,-1,0,91,0,"Relations",,,
+,92,90,256,0,89,1,-1,0,91,0,"Relations",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,26 +18,26 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,322,89,640,0,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
-,323,-1,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
,327,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,328,-1,256,0,0,0,0,299,1,-1,0,327,0,"Regular Element #3"
+,328,91,256,0,0,0,0,299,1,-1,0,327,0,"Regular Element #3"
,329,91,128,0,1,327,327,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,330,-1,128,0,1,327,327,300,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #3"
+,330,91,128,0,1,327,327,300,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #3"
,331,91,64,0,0,0,0,298,1,1,0,0,0,"Regular Element #2"
-,332,-1,64,0,0,0,0,298,1,-1,0,331,0,"Regular Element #2"
+,332,91,64,0,0,0,0,298,1,-1,0,331,0,"Regular Element #2"
,333,91,32,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,334,-1,32,0,0,0,0,297,1,-1,0,333,0,"Regular Element #1"
+,334,91,32,0,0,0,0,297,1,-1,0,333,0,"Regular Element #1"
,335,91,16,0,1,333,333,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,336,-1,16,0,1,333,333,301,1,-1,0,335,0,"[Translate to Dansk:] Regular Element #1"
+,336,91,16,0,1,333,333,301,1,-1,0,335,0,"[Translate to Dansk:] Regular Element #1"
,337,91,8,0,1,333,333,324,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,338,-1,8,0,1,333,333,324,1,-1,0,337,0,"[Translate to Dansk:] Regular Element #1"
+,338,91,8,0,1,333,333,324,1,-1,0,337,0,"[Translate to Dansk:] Regular Element #1"
,339,91,4,0,2,333,335,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,340,-1,4,0,2,333,335,302,1,-1,0,339,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,340,91,4,0,2,333,335,302,1,-1,0,339,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,341,91,2,0,2,333,333,326,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,342,-1,2,0,2,333,333,326,1,-1,0,341,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,342,91,2,0,2,333,333,326,1,-1,0,341,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyLivePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyLivePage.csv
index 88b4301fc460..b4568b1988a9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyLivePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAndCopyLivePage.csv
@@ -17,12 +17,12 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,322,89,640,0,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
-,323,-1,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
,327,91,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,328,91,128,0,1,327,327,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv
index 925ffe002dd7..a6dda8b6ec1c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv
@@ -10,10 +10,10 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,256,1,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,256,1,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,322,89,640,1,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
-,323,-1,384,1,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,384,1,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,1,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,1,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,1,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,1,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteMovedRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteMovedRecord.csv
index 1823b0c8e7a5..45d69d0ca71b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteMovedRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteMovedRecord.csv
@@ -10,11 +10,11 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,256,1,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,256,1,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,322,89,640,1,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
"# @todo Moved state is not reverted for translated records",,,,,,,,,,,,,,
-,323,-1,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
index eb23739c81b4..c57823accdfd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,0,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,4 +18,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
index ec5945aa5177..b827edfae701 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,298,1,1,0,0,0,"Regular Element #2 (copy 1)"
-,322,-1,128,0,0,0,0,298,1,-1,0,321,0,"Regular Element #2 (copy 1)"
+,322,89,128,0,0,0,0,298,1,-1,0,321,0,"Regular Element #2 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
index 5ceebe0702d4..68e1ec331979 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,1,0,298,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2"
-,322,-1,416,0,1,0,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
+,322,89,416,0,1,0,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 5fde268ba0b4..6aded18deb0a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,0,300,300,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
-,322,-1,1280,0,2,0,300,300,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
+,322,89,1280,0,2,0,300,300,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
index be81bad9b717..466af9a8879a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,90,256,0,89,1,1,0,0,0,"Relations","/data-handler/relations-1",,
-,92,-1,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
+,92,90,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,16 +18,16 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,322,-1,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
+,322,91,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
,323,91,128,0,1,321,321,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,324,-1,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
+,324,91,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
,325,91,64,0,0,0,0,298,1,1,0,0,0,"Regular Element #2"
-,326,-1,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
+,326,91,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
,327,91,32,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,328,-1,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
+,328,91,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
,329,91,16,0,1,327,327,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,330,-1,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
+,330,91,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
,331,91,8,0,2,327,329,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,332,-1,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,332,91,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
index 895a18c1bc29..c6c266c23497 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,90,256,0,90,1,1,0,0,0,"Target","/data-handler/target-1",,
-,92,-1,256,0,90,1,-1,0,91,0,"Target","/data-handler/target-1",,
+,92,90,256,0,90,1,-1,0,91,0,"Target","/data-handler/target-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,10 +18,10 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,2,0,323,312,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,322,-1,256,0,2,0,323,312,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
+,322,91,256,0,2,0,323,312,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
,323,91,128,0,1,0,325,311,1,1,0,0,0,"[Translate to Dansk:] Regular Element #10"
-,324,-1,128,0,1,0,325,311,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #10"
+,324,91,128,0,1,0,325,311,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #10"
,325,91,64,0,0,0,0,310,1,1,0,0,0,"Regular Element #10"
-,326,-1,64,0,0,0,0,310,1,-1,0,325,0,"Regular Element #10"
+,326,91,64,0,0,0,0,310,1,-1,0,325,0,"Regular Element #10"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyDraftPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyDraftPage.csv
index 5e4367e1f009..9d19abff1035 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyDraftPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyDraftPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,90,256,0,89,1,1,0,0,0,"Relations",,,
-,92,-1,256,0,89,1,-1,0,91,0,"Relations",,,
+,92,90,256,0,89,1,-1,0,91,0,"Relations",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,20 +18,20 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
,323,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,324,-1,256,0,0,0,0,299,1,-1,0,323,0,"Regular Element #3"
+,324,91,256,0,0,0,0,299,1,-1,0,323,0,"Regular Element #3"
,325,91,128,0,1,323,323,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,326,-1,128,0,1,323,323,300,1,-1,0,325,0,"[Translate to Dansk:] Regular Element #3"
+,326,91,128,0,1,323,323,300,1,-1,0,325,0,"[Translate to Dansk:] Regular Element #3"
,327,91,64,0,0,0,0,298,1,1,0,0,0,"Regular Element #2"
-,328,-1,64,0,0,0,0,298,1,-1,0,327,0,"Regular Element #2"
+,328,91,64,0,0,0,0,298,1,-1,0,327,0,"Regular Element #2"
,329,91,32,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,330,-1,32,0,0,0,0,297,1,-1,0,329,0,"Regular Element #1"
+,330,91,32,0,0,0,0,297,1,-1,0,329,0,"Regular Element #1"
,331,91,16,0,1,329,329,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,332,-1,16,0,1,329,329,301,1,-1,0,331,0,"[Translate to Dansk:] Regular Element #1"
+,332,91,16,0,1,329,329,301,1,-1,0,331,0,"[Translate to Dansk:] Regular Element #1"
,333,91,8,0,2,329,331,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,334,-1,8,0,2,329,331,302,1,-1,0,333,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,334,91,8,0,2,329,331,302,1,-1,0,333,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,335,91,4,0,0,0,0,321,1,1,0,0,0,"Testing #1"
-,336,-1,4,0,0,0,0,321,1,-1,0,335,0,"Testing #1"
+,336,91,4,0,0,0,0,321,1,-1,0,335,0,"Testing #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyLivePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyLivePage.csv
index e984162d6ba4..90d90a6dc56e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyLivePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndCopyLivePage.csv
@@ -17,9 +17,9 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
,323,91,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,324,91,128,0,1,323,323,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
,325,91,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentNDiscardCreatedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentNDiscardCreatedContent.csv
index 239a6f12c685..351c180a572f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentNDiscardCreatedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentNDiscardCreatedContent.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,1,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
index 1f44241b2b4d..322350c344ff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
@@ -10,8 +10,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
,323,89,640,0,0,0,0,0,1,1,0,0,0,"Testing #2"
-,324,-1,640,0,0,0,0,0,1,-1,0,323,0,"Testing #2"
+,324,89,640,0,0,0,0,0,1,-1,0,323,0,"Testing #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNCopyContentNDiscardCopiedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNCopyContentNDiscardCopiedContent.csv
index d80e4ebaf9de..24f5d04eb6bb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNCopyContentNDiscardCopiedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNCopyContentNDiscardCopiedContent.csv
@@ -10,8 +10,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,0,0,0,0,0,1,-1,0,321,0,"Testing #1"
,323,89,64,1,0,0,0,321,1,1,0,0,0,"Testing #1 (copy 1)"
-,324,-1,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
+,324,89,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyDraftParentPage.csv
index 3480ae65b39a..381c6039f6f7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyDraftParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyDraftParentPage.csv
@@ -5,15 +5,15 @@
,89,88,256,0,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,89,256,0,0,1,1,0,0,0,"Testing #1",,,
-,92,-1,256,0,0,1,-1,0,91,0,"Testing #1",,,
+,92,89,256,0,0,1,-1,0,91,0,"Testing #1",,,
,93,91,256,0,0,1,1,0,0,0,"Testing #2",,,
-,94,-1,256,0,0,1,-1,0,93,0,"Testing #2",,,
+,94,91,256,0,0,1,-1,0,93,0,"Testing #2",,,
,95,90,256,0,89,1,1,0,0,0,"Relations",,,
-,96,-1,256,0,89,1,-1,0,95,0,"Relations",,,
+,96,90,256,0,89,1,-1,0,95,0,"Relations",,,
,97,95,256,0,91,1,1,0,0,0,"Testing #1",,,
-,98,-1,256,0,91,1,-1,0,97,0,"Testing #1",,,
+,98,95,256,0,91,1,-1,0,97,0,"Testing #1",,,
,99,97,256,0,93,1,1,0,0,0,"Testing #2",,,
-,100,-1,256,0,93,1,-1,0,99,0,"Testing #2",,,
+,100,97,256,0,93,1,-1,0,99,0,"Testing #2",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -26,16 +26,16 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,95,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,322,-1,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
+,322,95,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
,323,95,128,0,1,321,321,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,324,-1,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
+,324,95,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
,325,95,64,0,0,0,0,298,1,1,0,0,0,"Regular Element #2"
-,326,-1,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
+,326,95,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
,327,95,32,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,328,-1,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
+,328,95,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
,329,95,16,0,1,327,327,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,330,-1,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
+,330,95,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
,331,95,8,0,2,327,329,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,332,-1,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,332,95,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyLiveParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyLiveParentPage.csv
index 563cfca6241d..688237db92d4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyLiveParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createNestedPagesAndCopyLiveParentPage.csv
@@ -5,9 +5,9 @@
,89,88,256,0,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,89,256,0,0,1,1,0,0,0,"Testing #1",,,
-,92,-1,256,0,0,1,-1,0,91,0,"Testing #1",,,
+,92,89,256,0,0,1,-1,0,91,0,"Testing #1",,,
,93,91,256,0,0,1,1,0,0,0,"Testing #2",,,
-,94,-1,256,0,0,1,-1,0,93,0,"Testing #2",,,
+,94,91,256,0,0,1,-1,0,93,0,"Testing #2",,,
,95,90,256,0,89,0,0,0,0,0,"Relations",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -21,7 +21,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,95,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,322,95,128,0,1,321,321,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
,323,95,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
index 45875292ebf1..ce131776be7d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
@@ -5,4 +5,4 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
,91,89,256,0,0,1,1,0,0,0,"Testing #1","/data-handler/relations/testing-1"
-,92,-1,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1"
+,92,89,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyDraftParentPage.csv
index 71fc463354bd..62d246f3ea1f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyDraftParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyDraftParentPage.csv
@@ -5,11 +5,11 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,89,256,0,0,1,1,0,0,0,"Testing #1","/data-handler/relations/testing-1",,
-,92,-1,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1",,
+,92,89,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1",,
,93,90,256,0,89,1,1,0,0,0,"Relations","/data-handler/relations-1",,
-,94,-1,256,0,89,1,-1,0,93,0,"Relations","/data-handler/relations-1",,
+,94,90,256,0,89,1,-1,0,93,0,"Relations","/data-handler/relations-1",,
,95,93,256,0,91,1,1,0,0,0,"Testing #1","/data-handler/relations/testing-1-1",,
-,96,-1,256,0,91,1,-1,0,95,0,"Testing #1","/data-handler/relations/testing-1-1",,
+,96,93,256,0,91,1,-1,0,95,0,"Testing #1","/data-handler/relations/testing-1-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -22,16 +22,16 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,93,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,322,-1,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
+,322,93,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
,323,93,128,0,1,321,321,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,324,-1,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
+,324,93,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
,325,93,64,0,0,0,0,298,1,1,0,0,0,"Regular Element #2"
-,326,-1,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
+,326,93,64,0,0,0,0,298,1,-1,0,325,0,"Regular Element #2"
,327,93,32,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,328,-1,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
+,328,93,32,0,0,0,0,297,1,-1,0,327,0,"Regular Element #1"
,329,93,16,0,1,327,327,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,330,-1,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
+,330,93,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
,331,93,8,0,2,327,329,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,332,-1,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,332,93,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyLiveParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyLiveParentPage.csv
index d601b57aada7..2ce4b0d4faaf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyLiveParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndCopyLiveParentPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,89,256,0,0,1,1,0,0,0,"Testing #1","/data-handler/relations/testing-1",,
-,92,-1,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1",,
+,92,89,256,0,0,1,-1,0,91,0,"Testing #1","/data-handler/relations/testing-1",,
,93,90,256,0,89,0,0,0,0,0,"Relations","/data-handler/relations-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -19,7 +19,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,93,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,322,93,128,0,1,321,321,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
,323,93,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
index cfa7785dbfb4..22235ed71e0c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
@@ -4,11 +4,11 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,0,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
,93,88,128,0,0,1,1,0,0,0,"Testing #1","/data-handler/testing-1",,
-,94,-1,128,0,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
-,95,-1,256,0,88,1,2,0,88,0,"DataHandlerTest","/data-handler",,
+,94,88,128,0,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
+,95,1,256,0,88,1,2,0,88,0,"DataHandlerTest","/data-handler",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -21,4 +21,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
index 7f8d900d8eb6..7774f6dbad52 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
@@ -4,10 +4,10 @@
,88,1,256,1,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,1,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,1,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,1,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
,93,88,128,1,0,1,1,0,0,0,"Testing #1","/data-handler/testing-1",,
-,94,-1,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
+,94,88,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
"tt_content",,,,,,,,,,,,,,
,"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,1,0,0,0,0,0,0,0,0,0,"Regular Element #0"
@@ -20,4 +20,4 @@
,310,90,256,1,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,1,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,1,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
index 2ef19f74ba88..34164201556e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyDraftPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyDraftPage.csv
index 5d8d015ca3b8..95553d8749a2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyDraftPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyDraftPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,90,256,0,89,1,1,0,0,0,"Relations","/data-handler/relations-1",,
-,92,-1,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
+,92,90,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,15 +18,15 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
,322,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,323,-1,256,0,0,0,0,299,1,-1,0,322,0,"Regular Element #3"
+,323,91,256,0,0,0,0,299,1,-1,0,322,0,"Regular Element #3"
,324,91,128,0,1,322,322,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,325,-1,128,0,1,322,322,300,1,-1,0,324,0,"[Translate to Dansk:] Regular Element #3"
+,325,91,128,0,1,322,322,300,1,-1,0,324,0,"[Translate to Dansk:] Regular Element #3"
,326,91,64,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,327,-1,64,0,0,0,0,297,1,-1,0,326,0,"Regular Element #1"
+,327,91,64,0,0,0,0,297,1,-1,0,326,0,"Regular Element #1"
,328,91,32,0,1,326,326,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,329,-1,32,0,1,326,326,301,1,-1,0,328,0,"[Translate to Dansk:] Regular Element #1"
+,329,91,32,0,1,326,326,301,1,-1,0,328,0,"[Translate to Dansk:] Regular Element #1"
,330,91,16,0,2,326,328,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,331,-1,16,0,2,326,328,302,1,-1,0,330,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,331,91,16,0,2,326,328,302,1,-1,0,330,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyLivePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyLivePage.csv
index 6d825d915a0e..4aded7122403 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyLivePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndCopyLivePage.csv
@@ -17,8 +17,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
,322,91,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,323,91,128,0,1,322,322,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
,324,91,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndPage.csv
index f6aa8b0575c5..13802c242466 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContentAndPage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,0,89,1,2,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,0,89,1,2,0,89,0,"Relations","/data-handler/relations",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -17,5 +17,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,0,0,0,298,1,2,0,298,0,"Regular Element #2"
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 6b3feaa3a4b1..8025d6ebbd8f 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
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,1024,0,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
-,322,-1,768,0,0,0,0,299,1,2,0,299,0,"Regular Element #3"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,1024,0,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+,322,89,768,0,0,0,0,299,1,2,0,299,0,"Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
index 818deea5bae5..134e6363a0d9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,0,89,1,2,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,0,89,1,2,0,89,0,"Relations","/data-handler/relations",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -17,4 +17,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContent.csv
index 306876bd92c0..d13cd4e2eeb2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,1,0,0,0,298,1,0,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,1,0,0,0,298,1,0,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContentAndMoveToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContentAndMoveToDifferentPage.csv
index 8bd5efceeb1a..35ca48027b7c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContentAndMoveToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/hideContentAndMoveToDifferentPage.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,1,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,1,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,1,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
index 7409213795c6..a0ac2a77a1ff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,0,1,298,298,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2"
-,322,-1,416,0,0,1,298,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
+,322,89,416,0,0,1,298,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
index 396ebc8154e6..e4f62201ba91 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,299,300,300,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
-,322,-1,1280,0,2,299,300,300,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
+,322,89,1280,0,2,299,300,300,1,-1,0,321,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
index 7409213795c6..a0ac2a77a1ff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,0,1,298,298,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2"
-,322,-1,416,0,0,1,298,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
+,322,89,416,0,0,1,298,298,298,1,-1,0,321,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
index 2c0a373c2a69..c1e6cf61170b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
,90,88,512,0,0,0,0,0,0,0,0,0,"Target","/data-handler/target"
,91,88,256,0,1,89,0,1,1,0,0,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations"
-,92,-1,256,0,1,89,0,1,-1,0,91,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations"
+,92,88,256,0,1,89,0,1,-1,0,91,0,"[Translate to Dansk:] Relations","/data-handler/translate-to-dansk-relations"
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,4 +18,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
index c54f485993fa..9b8c0377460b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,0,0,298,0,"Testing #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,0,0,0,0,298,1,0,0,298,0,"Testing #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
index ac01f444ed84..1b5f7e5cb248 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
@@ -4,4 +4,4 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-,91,-1,256,0,89,1,0,0,89,0,"Testing #1","/data-handler/relations"
+,91,88,256,0,89,1,0,0,89,0,"Testing #1","/data-handler/relations"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyDraftPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyDraftPage.csv
index 51c592150cff..8748d3679fad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyDraftPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyDraftPage.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
,91,90,256,0,89,1,1,0,0,0,"Relations","/data-handler/relations-1",,
-,92,-1,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
+,92,90,256,0,89,1,-1,0,91,0,"Relations","/data-handler/relations-1",,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,20 +18,20 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
-,323,-1,256,0,0,0,0,296,1,4,0,296,0,"Regular Element #0"
+,323,89,256,0,0,0,0,296,1,4,0,296,0,"Regular Element #0"
,324,89,128,0,0,0,0,0,1,3,0,0,296,"[MOVE-TO PLACEHOLDER for #296, WS#1]"
,325,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,326,-1,256,0,0,0,0,299,1,-1,0,325,0,"Regular Element #3"
+,326,91,256,0,0,0,0,299,1,-1,0,325,0,"Regular Element #3"
,327,91,128,0,1,325,325,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,328,-1,128,0,1,325,325,300,1,-1,0,327,0,"[Translate to Dansk:] Regular Element #3"
+,328,91,128,0,1,325,325,300,1,-1,0,327,0,"[Translate to Dansk:] Regular Element #3"
,329,91,64,0,0,0,0,297,1,1,0,0,0,"Regular Element #1"
-,330,-1,64,0,0,0,0,297,1,-1,0,329,0,"Regular Element #1"
+,330,91,64,0,0,0,0,297,1,-1,0,329,0,"Regular Element #1"
,331,91,32,0,1,329,329,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,332,-1,32,0,1,329,329,301,1,-1,0,331,0,"[Translate to Dansk:] Regular Element #1"
+,332,91,32,0,1,329,329,301,1,-1,0,331,0,"[Translate to Dansk:] Regular Element #1"
,333,91,16,0,2,329,331,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,334,-1,16,0,2,329,331,302,1,-1,0,333,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,334,91,16,0,2,329,331,302,1,-1,0,333,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,335,91,8,0,0,0,0,324,1,1,0,0,0,"Regular Element #0"
-,336,-1,8,0,0,0,0,324,1,-1,0,335,0,"Regular Element #0"
+,336,91,8,0,0,0,0,324,1,-1,0,335,0,"Regular Element #0"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyLivePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyLivePage.csv
index 1e7776c617ed..6c4ae70da726 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyLivePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentAndCopyLivePage.csv
@@ -17,10 +17,10 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
-,323,-1,256,0,0,0,0,296,1,4,0,296,0,"Regular Element #0"
+,323,89,256,0,0,0,0,296,1,4,0,296,0,"Regular Element #0"
,324,89,128,0,0,0,0,0,1,3,0,0,296,"[MOVE-TO PLACEHOLDER for #296, WS#1]"
,325,91,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,326,91,128,0,1,325,325,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
index 96c3fd790d4e..f2dd74af6b4e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageAndHide.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageAndHide.csv
index 8bd5efceeb1a..35ca48027b7c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageAndHide.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageAndHide.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,1,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,1,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,1,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 4a0059165e8b..5f7d0611ac1c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -10,12 +10,12 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,90,512,0,0,0,0,298,1,4,0,298,0,"Regular Element #2"
,322,90,128,0,0,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]"
-,323,-1,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
+,323,90,256,0,0,0,0,297,1,4,0,297,0,"Regular Element #1"
,324,90,192,0,0,0,0,0,1,3,0,0,297,"[MOVE-TO PLACEHOLDER for #297, WS#1]"
-,325,-1,384,0,1,323,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,325,90,384,0,1,323,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,326,90,160,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,327,-1,448,0,2,323,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,327,90,448,0,2,323,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,328,90,144,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
index 09a5fa0dba6a..a375f863a43b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,90,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,90,256,0,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -18,4 +18,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
index 029ec06f05c7..5e2378dcdd37 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
@@ -4,9 +4,9 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,512,0,90,1,4,0,90,0,"Target","/data-handler/target",,
+,91,1,512,0,90,1,4,0,90,0,"Target","/data-handler/target",,
,92,1,128,0,0,1,3,0,0,90,"[MOVE-TO PLACEHOLDER for #90, WS#1]",,,
-,93,-1,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,93,1,256,0,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,94,1,192,0,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
"tt_content",,,,,,,,,,,,,,
,"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"
@@ -20,4 +20,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNCreatePageAfterMovedPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNCreatePageAfterMovedPage.csv
index 61cce76e0d52..8bf805ac1163 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNCreatePageAfterMovedPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNCreatePageAfterMovedPage.csv
@@ -4,7 +4,7 @@
,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-,91,-1,512,0,90,1,4,0,90,0,"Target","/data-handler/target"
+,91,1,512,0,90,1,4,0,90,0,"Target","/data-handler/target"
,92,1,128,0,0,1,3,0,0,90,"[MOVE-TO PLACEHOLDER for #90, WS#1]",
,93,1,192,0,0,1,1,0,0,0,"Testing #1","/testing-1"
-,94,-1,192,0,0,1,-1,0,93,0,"Testing #1","/testing-1"
+,94,1,192,0,0,1,-1,0,93,0,"Testing #1","/testing-1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changeContentSorting.csv
index eae14497884f..9e7f8cf4c199 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changeContentSorting.csv
@@ -10,8 +10,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,323,-1,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,323,89,384,0,1,321,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,324,89,576,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,325,-1,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,325,89,448,0,2,321,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,326,89,544,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changePageSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changePageSorting.csv
index 4094f6dedb36..6a726fe89903 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changePageSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/changePageSorting.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContent.csv
index cd6320c157b0..ac7e05d10cb0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,298,0,0,0,0,0,"Regular Element #2 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
index 457fd42b1135..e9d8fb9fa90f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,1,0,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 9fe334706c12..4689795c971b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,0,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPage.csv
index e4943446e4ce..a8cef469c26b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPage.csv
@@ -17,14 +17,14 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,0,0,0,299,1,1,0,0,0,"Regular Element #3"
-,322,-1,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
+,322,91,256,0,0,0,0,299,1,-1,0,321,0,"Regular Element #3"
,323,91,128,0,1,321,321,300,1,1,0,0,0,"[Translate to Dansk:] Regular Element #3"
-,324,-1,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
+,324,91,128,0,1,321,321,300,1,-1,0,323,0,"[Translate to Dansk:] Regular Element #3"
,325,91,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
,327,91,32,0,0,0,0,297,0,0,0,0,0,"Regular Element #1"
,329,91,16,0,1,327,327,301,1,1,0,0,0,"[Translate to Dansk:] Regular Element #1"
-,330,-1,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
+,330,91,16,0,1,327,327,301,1,-1,0,329,0,"[Translate to Dansk:] Regular Element #1"
,331,91,8,0,2,327,329,302,1,1,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,332,-1,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,332,91,8,0,2,327,329,302,1,-1,0,331,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPageFreeMode.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPageFreeMode.csv
index 297886c54896..03011c1efa54 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPageFreeMode.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyPageFreeMode.csv
@@ -17,7 +17,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,2,0,323,312,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
,323,91,128,0,1,0,325,311,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,325,91,64,0,0,0,0,310,0,0,0,0,0,"Regular Element #10"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentNDiscardCreatedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentNDiscardCreatedContent.csv
index 239a6f12c685..351c180a572f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentNDiscardCreatedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentNDiscardCreatedContent.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,1,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContents.csv
index 3b589eaa4bec..49575d36fd6a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContents.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,0,0,0,0,0,"Testing #1"
,323,89,640,0,0,0,0,0,0,0,0,0,0,"Testing #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createNCopyContentNDiscardCopiedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createNCopyContentNDiscardCopiedContent.csv
index 422ba7828885..95c8265a0d3e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createNCopyContentNDiscardCopiedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createNCopyContentNDiscardCopiedContent.csv
@@ -10,7 +10,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,0,0,0,0,0,"Testing #1"
,323,89,64,1,0,0,0,321,1,1,0,0,0,"Testing #1 (copy 1)"
-,324,-1,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
+,324,89,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
index 7bab0924b381..37b5f9d3f824 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
@@ -4,10 +4,10 @@
,88,1,256,1,88,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,1,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,1,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,1,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
,93,88,128,1,0,1,1,0,0,0,"Testing #1","/data-handler/testing-1",,
-,94,-1,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
+,94,88,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
"tt_content",,,,,,,,,,,,,,
,"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,1,0,0,0,0,0,0,0,0,0,"Regular Element #0"
@@ -20,7 +20,8 @@
,310,90,256,1,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,1,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,1,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,322,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,323,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,322,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,323,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv
index c38a4b7b5f28..86836992311e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv
index 3e6f435ecc18..47cd453fbf6b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv
@@ -16,8 +16,9 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,1,0,0,0,298,1,2,0,298,0,"Regular Element #2"
-,322,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,323,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,324,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,1,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,322,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,324,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv
index e8656e82ce18..4a23879b7bb2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv
index f726fbb04983..f3d5f6c2eb18 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv
@@ -16,7 +16,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,322,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,323,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,322,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,323,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
index be9213d7fbcc..754cd7a65655 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,1,298,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
index 52cfe36afe05..7750dc85203e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,299,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
index 44d717d29157..3b62a31d8b09 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
@@ -17,4 +17,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/modifyContent.csv
index 109a1e9d6c74..35b7a743d83d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/modifyContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPage.csv
index 6967992f3c4b..e88d67bb815a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPage.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
index f16aaea3525a..7f2773340a05 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -10,8 +10,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,325,-1,384,0,1,323,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,325,90,384,0,1,323,297,301,1,4,0,301,0,"[Translate to Dansk:] Regular Element #1"
,326,90,160,0,1,297,0,0,1,3,0,0,301,"[MOVE-TO PLACEHOLDER for #301, WS#1]"
-,327,-1,448,0,2,323,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,327,90,448,0,2,323,301,302,1,4,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,328,90,144,0,2,297,0,0,1,3,0,0,302,"[MOVE-TO PLACEHOLDER for #302, WS#1]"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPage.csv
index 3c2e914f0492..f0c5323d7f04 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPage.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPageNChangeSorting.csv
index 800404388b1d..915263dc7c5c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageToDifferentPageNChangeSorting.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changeContentSorting.csv
index 9ca5fd92edd3..31dc54f7a23f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changeContentSorting.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changePageSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changePageSorting.csv
index 4094f6dedb36..6a726fe89903 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changePageSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/changePageSorting.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContent.csv
index cd6320c157b0..ac7e05d10cb0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,298,0,0,0,0,0,"Regular Element #2 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
index 457fd42b1135..e9d8fb9fa90f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,1,0,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 9fe334706c12..4689795c971b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,0,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPage.csv
index 79d12787bc7e..be85e2916ac6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPage.csv
@@ -17,7 +17,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3"
,323,91,128,0,1,321,321,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3"
,325,91,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPageFreeMode.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPageFreeMode.csv
index 297886c54896..03011c1efa54 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPageFreeMode.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyPageFreeMode.csv
@@ -17,7 +17,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,91,256,0,2,0,323,312,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
,323,91,128,0,1,0,325,311,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,325,91,64,0,0,0,0,310,0,0,0,0,0,"Regular Element #10"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentNDiscardCreatedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentNDiscardCreatedContent.csv
index 239a6f12c685..351c180a572f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentNDiscardCreatedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentNDiscardCreatedContent.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,1,0,0,0,0,1,1,0,0,0,"Testing #1"
-,322,-1,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
+,322,89,128,1,0,0,0,0,1,-1,0,321,0,"Testing #1"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContents.csv
index 3b589eaa4bec..49575d36fd6a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContents.csv
@@ -10,6 +10,6 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,0,0,0,0,0,"Testing #1"
,323,89,640,0,0,0,0,0,0,0,0,0,0,"Testing #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createNCopyContentNDiscardCopiedContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createNCopyContentNDiscardCopiedContent.csv
index 422ba7828885..95c8265a0d3e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createNCopyContentNDiscardCopiedContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createNCopyContentNDiscardCopiedContent.csv
@@ -10,7 +10,7 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,128,0,0,0,0,0,0,0,0,0,0,"Testing #1"
,323,89,64,1,0,0,0,321,1,1,0,0,0,"Testing #1 (copy 1)"
-,324,-1,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
+,324,89,64,1,0,0,0,321,1,-1,0,323,0,"Testing #1 (copy 1)"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
index 7bab0924b381..37b5f9d3f824 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv
@@ -4,10 +4,10 @@
,88,1,256,1,88,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,1,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,1,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,1,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
,93,88,128,1,0,1,1,0,0,0,"Testing #1","/data-handler/testing-1",,
-,94,-1,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
+,94,88,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
"tt_content",,,,,,,,,,,,,,
,"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,1,0,0,0,0,0,0,0,0,0,"Regular Element #0"
@@ -20,7 +20,8 @@
,310,90,256,1,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,1,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,1,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,322,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,323,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,322,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,323,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
index 7f8d900d8eb6..7774f6dbad52 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteLiveParentPage.csv
@@ -4,10 +4,10 @@
,88,1,256,1,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,
,89,88,256,1,0,0,0,0,0,0,"Relations","/data-handler/relations",,
,90,88,512,1,0,0,0,0,0,0,"Target","/data-handler/target",,
-,91,-1,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
+,91,88,256,1,89,1,4,0,89,0,"Relations","/data-handler/relations",,
,92,88,768,1,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]",,,
,93,88,128,1,0,1,1,0,0,0,"Testing #1","/data-handler/testing-1",,
-,94,-1,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
+,94,88,128,1,0,1,-1,0,93,0,"Testing #1","/data-handler/testing-1",,
"tt_content",,,,,,,,,,,,,,
,"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,1,0,0,0,0,0,0,0,0,0,"Regular Element #0"
@@ -20,4 +20,4 @@
,310,90,256,1,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,1,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,1,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv
index c38a4b7b5f28..86836992311e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv
index 3e6f435ecc18..47cd453fbf6b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv
@@ -16,8 +16,9 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,512,1,0,0,0,298,1,2,0,298,0,"Regular Element #2"
-,322,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,323,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,324,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,512,1,0,0,0,298,1,2,0,298,0,"Regular Element #2"
+,322,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,323,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,324,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
index e8656e82ce18..4a23879b7bb2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv
index f726fbb04983..f3d5f6c2eb18 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv
@@ -16,7 +16,8 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
-,321,-1,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
-,322,-1,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
-,323,-1,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
+# 320 is discarded now since page 89 has been deleted
+,320,89,512,1,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,321,89,384,1,1,297,297,301,1,2,0,301,0,"[Translate to Dansk:] Regular Element #1"
+,322,89,448,1,2,297,301,302,1,2,0,302,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
+,323,89,1024,1,1,299,299,300,1,2,0,300,0,"[Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
index be9213d7fbcc..754cd7a65655 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,416,0,1,298,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
index 52cfe36afe05..7750dc85203e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -10,5 +10,5 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
,321,89,1280,0,2,299,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
index 44d717d29157..3b62a31d8b09 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
@@ -17,4 +17,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/modifyContent.csv
index 109a1e9d6c74..35b7a743d83d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/modifyContent.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPage.csv
index 6967992f3c4b..e88d67bb815a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPage.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 7754dfc2e141..0941cff7b297 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -10,4 +10,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPage.csv
index 3c2e914f0492..f0c5323d7f04 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPage.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPageNChangeSorting.csv
index 800404388b1d..915263dc7c5c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageToDifferentPageNChangeSorting.csv
@@ -16,4 +16,4 @@
,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10"
,311,90,512,0,1,0,310,310,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,312,90,768,0,2,0,311,311,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10"
-,320,-1,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
+,320,89,512,0,0,0,0,298,2,2,0,298,0,"Regular Element #2"
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
index d71bcf3ebf76..f354f9f60b8b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","1,2,3"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","1,2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
index a98b750b7e7e..4b1c380c6e83 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1","2,1"
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1","2,1"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
index 00bec6192927..89d86eb35e8b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
@@ -13,5 +13,5 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,4,0,1,0,"Element #1",
+,4,89,256,0,0,0,1,4,0,1,0,"Element #1",
,5,89,640,0,0,0,1,3,0,0,1,"[MOVE-TO PLACEHOLDER for #1, WS#1]",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
index 088aeebbe48d..feb5fe80f447 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)","2,3"
-,300,-1,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)","2,3"
+,300,89,128,0,0,0,1,-1,0,299,0,"Regular Element #2 (copy 1)","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
index 935608a9ce51..860f4e2660c2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
@@ -14,4 +14,4 @@
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,1,0,0,0,"Element #1 (copy 1)",
-,5,-1,128,0,0,0,1,-1,0,4,0,"Element #1 (copy 1)",
+,5,89,128,0,0,0,1,-1,0,4,0,"Element #1 (copy 1)",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
index b32c85842efc..3882ccc4b654 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",1
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",1
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",1
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
index bda8656eeb40..17d954c611c2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
@@ -9,11 +9,11 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",4
-,300,-1,128,0,0,0,1,-1,0,299,0,"Testing #1",4
+,300,89,128,0,0,0,1,-1,0,299,0,"Testing #1",4
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,1,0,0,0,"Testing #1",
-,5,-1,128,0,0,0,1,-1,0,4,0,"Testing #1",
+,5,89,128,0,0,0,1,-1,0,4,0,"Testing #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 8f4f842c8725..7b2a297c8d9d 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
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2","2,3"
+,299,89,512,0,0,0,1,2,0,298,0,"Regular Element #2","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
index 7ff65881a3c5..bef1b6a29815 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
@@ -13,4 +13,4 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,2,0,1,0,"Element #1",
+,4,89,256,0,0,0,1,2,0,1,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
index 221894a865d3..3b898e59a5c3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",1
+,299,89,256,0,0,0,1,0,0,297,0,"Regular Element #1",1
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
index 3cdd6477dc60..98ff5657eddb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
@@ -9,7 +9,7 @@
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2","2,3"
-,300,-1,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2","2,3"
+,300,89,768,0,1,298,1,-1,0,299,0,"[Translate to Dansk:] Regular Element #2","2,3"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
index 0d3770a2c5a4..19794e25a669 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
@@ -5,7 +5,7 @@
,89,88,256,0,0,0,0,0,0,"Relations",,,
,90,88,512,0,0,0,0,0,0,"Target",,,
,91,88,256,0,1,1,0,0,0,"[Translate to Dansk:] Relations",,,
-,92,-1,256,0,1,-1,0,91,0,"[Translate to Dansk:] Relations",,,
+,92,88,256,0,1,-1,0,91,0,"[Translate to Dansk:] Relations",,,
"tt_content",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
@@ -16,4 +16,4 @@
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,1,1,1,0,0,0,"[Translate to Dansk:] Element #1",
-,5,-1,384,0,1,1,1,-1,0,4,0,"[Translate to Dansk:] Element #1",
+,5,89,384,0,1,1,1,-1,0,4,0,"[Translate to Dansk:] Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
index f5b5dc8a3e60..4a73a73ec9d9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
@@ -8,10 +8,10 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,0,0,1,0,"Testing #1",
+,4,89,256,0,0,0,1,0,0,1,0,"Testing #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
index 364c61d72114..193f15c8054b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
+,299,89,256,0,0,0,1,0,0,297,0,"Testing #1","1,2"
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
index fb76dea786c5..dbc975a5d645 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
@@ -13,4 +13,4 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",
-,4,-1,256,0,0,0,1,0,0,1,0,"Testing #1",
+,4,89,256,0,0,0,1,0,0,1,0,"Testing #1",
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index e1f8c0cbbdbf..d638e25f1e7e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -8,7 +8,7 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_select"
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","1,2"
,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","2,3"
-,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2","2,3"
+,299,90,512,0,0,0,1,4,0,298,0,"Regular Element #2","2,3"
,300,90,256,0,0,0,1,3,0,0,298,"[MOVE-TO PLACEHOLDER for #298, WS#1]",
"tx_testdatahandler_element",,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
diff --git a/typo3/sysext/workspaces/Tests/Functional/Service/Fixtures/WorkspaceServiceTestMovedContent.xml b/typo3/sysext/workspaces/Tests/Functional/Service/Fixtures/WorkspaceServiceTestMovedContent.xml
index ad2c46a9dbbe..f0fd0393b8ce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Service/Fixtures/WorkspaceServiceTestMovedContent.xml
+++ b/typo3/sysext/workspaces/Tests/Functional/Service/Fixtures/WorkspaceServiceTestMovedContent.xml
@@ -52,7 +52,7 @@
<pages>
<uid>103</uid>
- <pid>-1</pid>
+ <pid>2</pid>
<title>Dummy 1-2-3 - "move from placeholder"</title>
<deleted>0</deleted>
<perms_everybody>15</perms_everybody>
@@ -86,7 +86,7 @@
<tt_content>
<uid>105</uid>
- <pid>-1</pid>
+ <pid>7</pid>
<header>Content - "move from placeholder"</header>
<deleted>0</deleted>
<t3ver_oid>5</t3ver_oid>
@@ -119,7 +119,7 @@
<tt_content>
<uid>106</uid>
- <pid>-1</pid>
+ <pid>2</pid>
<header>Content - "move from placeholder"</header>
<deleted>0</deleted>
<t3ver_oid>6</t3ver_oid>
@@ -140,4 +140,4 @@
<t3ver_stage>0</t3ver_stage>
<t3ver_move_id>6</t3ver_move_id>
</tt_content>
-</dataset>
\ No newline at end of file
+</dataset>
--
GitLab