diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 46ee8c0b07c37e0480bf65a4d2edc06a65336e5b..e391dbd1d79d97b83ec56b88fd75a9dc76ff5fdc 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 a8b1b35f1e5684c8b793c70ae811ea023f61d9b8..29aad1a9d71ee0cb5987e0cd0e1a04a78a7086df 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 ec23b5759b46c057c3ce33e66a6c0b5959286945..0fe34109cfbe7dd7abba6b3db72c765fa00377e6 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 a3e71c7295fafc50cf2476ec368732d24fca4044..904263fe5069544f466bc73bc83d97bb4ab10338 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 328a2104526eef61d60a0091adbebb648c720188..0ad6f6fa1b0dbc9ecc59f271253fbdfc05a3c8a0 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 311b69352f602003221b800706d3e8bfde03b615..6b29119dff3180751bb47916dd18d8d33c0dcc60 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 dbfa11533512641df6f8c13a6972ac85a32f12a6..339e963edaa350dee017295789ea9d49819a561f 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 d316ac030fe7011f3c319ae3b85c3610dc90750e..f0dcbf4f297c5ebd400fff48e06ee6036c473b48 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 960afcb51cc1579f28d679bdd090dea96d12f7b3..21154172c29ff930803bd4b4e321d7afab81a38d 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 ec15308b8abe43a2a1ee6498f4bfdc2bca78c9b2..782146508a41d526acd6ef67e267476e80027665 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 108ed64566bcacd5000e9a40bc6f454ccadf1bb1..c52c28d78e7d5b5569881a6340e6cb263d74e702 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 8188e26dd55e17f310e2d1a3fc8c9b041bb836b2..dfee48bb858ae9a06601422dbdd5ee7d46c34f7b 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 ebfed28eb1f8b41269754ca48a45f29670f314c8..699974a6ed9149ab52098a3a7929fdac9417fcaa 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 0000000000000000000000000000000000000000..09271c9ea51d3a838003cc28384dcc152d3ecf7e
--- /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 9b2c89d53d28ccde16baca4e805c22eca315b155..c5a0d5e283a2cbf52b5a2208d46213f7331d8cff 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 d709aa33e96ac8237b032469408cb46ede4084a5..316dcd3e3b550c206fabb1a4e6bdbd31bd200363 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 f7847bb96eb9919b7a1520e880d2e467f1d913e8..359cde8138d6d59f34bb0e57b8eeacd2ba99c9a8 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 f9ace33ff9a952d379c41d20827eb6649f223118..a491c9013f46cd706be975b0a60ab100ccd56873 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 9ffdc2d9428f201edf24642492081446d868194a..198e3d04a68d22a9693095fdeb0fcd9e9a260bbd 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 99f7c22c0ed96145b3b80a82114cbb8ba683e1c3..59806e61c54695bee812f592c87586a33b26f325 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 ad2e83b685cb7fd915f1c2a34b08dc20302e9636..07f2547ce6e166b03ac6ab1dd2337098b530255d 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 0000000000000000000000000000000000000000..c3abe8ba1647aefb830f0acc66dde90e1deae363
--- /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 0000000000000000000000000000000000000000..39f70f400b723efa9db646dd7ab6192ed06ba277
--- /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 0000000000000000000000000000000000000000..ac03c15e1c1938bf0039c26c280eea1e56c2bcd7
--- /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 72b5e6cb75b77b4f3fc5bf49741ee05e2acc72c2..1efb81dedf3efcc4eabaf4947bcbb8d14248d5f8 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 7da22e5371ddc0fd127d01033d226e8c8c62b9b1..d9583d13885c39c93ad7063f71b0c351a9a1d710 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 9196015f0b4d9ac20ffc5707ce8b0af6a1ece6c8..70764f36329429163164fda7e89b232dcadbdee2 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 ecba9e9f9c7e8b9031978156937cfad787e60363..2e62cf10d46980a4b4198cf54d92961b133f7144 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 20280771ae7137823ae8d13df478b956e9959a88..c10a969675cbd9a54621d894e361c83d40d8794d 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 285478c356571008ea424cfbe3d4c879e4317a9a..d764fde24ef1ddf807b5c44bdf9059ec2653cfdb 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 a635855a4e893d16b71a0f139b80261a3a2a437d..0d23ab5264759908958fd2367fd11c58c2cba82a 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 63005013ec7258aaef07b9ddc6b87cc1575cffc1..04c7f5e9322b466265d1d6049e5f44cdffbbbb18 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 8f5688c7073e4b58864b2bda558125dc50f73d02..157aa671f2f0a36e51d339a9355ae2ada5f0a8ed 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 961bdb59cede3dfd92b518a79dece6b1eb7ac7b8..c318757b0896adaede0889302644f527d6c39272 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 bf28ad0412127b5e22a2979e7e3a5e4b6cd82ce0..65645122dc0830f85d9cda7abd5aa7ff89845492 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 8c440177326a691f6a9084414b424d7705dc0266..32b0f3e205c28ef2e748decc0dc27c77f6d6d02b 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 6e74d341e1dd5f001e26593641c24933d5af7999..421cae0906854a3c8c192965fed459e7b10aeffb 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 32330c4e74e72dbc657b0556a6f6c2279d331da0..19cb0289ac456350e1c7b9c928eb3b424b3bd562 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 f5669f79c0f1f6757ebaf283e2a44fb8e9625f6a..c800daa2ea76c4c3d35abb0482d7785e06229bd7 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 9f88a0fcb5ede4f66fe7b93721b9553b8d423e78..3d69b07d5d7a4c0a5133dd9bffa2abf94f4c40d4 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 c7a48a40a441e57603eff8f6f5198f641e5b385f..f754e6afdb6275f241c3b3b087bdfefab743cfb5 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 cb1593acd61c4cc85c3d7a2c86732a7aec3e9cb5..5544289f55707055dc9badbe773dd523181380d2 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 f7fdf61c802fb2d3c10b807dd3b6ac848bd40824..d8b43446ece2dac167a3c901d5ab36869aa7a976 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 90196018b84b5830e6eac4ec2f004b009e3b1b03..df66975f272a9b347f1a09cf086b5c9efee85e05 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 e7d29cce806034e79c0b20746287336704141078..c02b3816ea52d016e63fa4539c281c0f5f9c9767 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 c7fb6cd2672fe3f553bb4247aa5b921eccdb5d50..6b137734f13dca04e18913dc8e949f07540237cc 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 cbf7d6d44ac2ae7d847a8cb49c82d87a5f043b39..92eb57bac4c828530b7f5f1712955a6c6100c7c1 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 bf6669644aafa172e45874abb4a7662415d32afe..495874e5fcc1b9b56a64809b7299ce0c6fe606eb 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 f890fce214316e09e6c8dec4a8f47fc20b9d64fa..af35f060905511b58f5e38c2d76d766ecce68331 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 fc16235921ab01be543e3f036cc58089dca39f4d..88030bba00c043b51a3cdf6256b28defb24263e2 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 788e6cc4d709d9bf34226af7e75c48fe667ea21a..23b970c69e038814d58c7c872e0a3d82bf0fd621 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 9f348beff8a1d8303eb93da414252e9894159d58..9ce891b45b478a248b9e5bc907c50a737b61d919 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 d7ce60d3c38d0d33525135f681b57b67654f78d5..786e8fe71e65b6a6ea0256d268af7596df282ea5 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 0eccb3aa5562cb8b55250a211950d4c09d6cd8a2..fad0fff2b460997f212b660a62f6b1327e7e3b2a 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 d3df3ad6da87326576972660225eea67b4d0d26f..d93e17ab695c447800ae38daa4b618fa992c62a5 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 61ede3492a9447ae36b833c47a0d29dab1a58fa6..75efe1fdb0bf353f006020d9bd34f7f863cbe1fd 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 0164be1686d8e7d74c3ee279b24e45bd73b320be..035f9dd4ab71485ab34627b165ca2c279c4a27f8 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 87d5f8b4fb985bea01f0d1dd0bbba0adfc6a6cf1..5372354b7396e5546e637ef9608f1b72445b6a14 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 ac41e772eba9e8aef8cf96872b0c92838f031e0d..f35ea4c8ac03b57708753987dbbc5577e8fd7787 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 9d367cf9b1749abe9b8560a640ec9eb4b87d4fae..ffe4af05a3da09b43e32605d29b53a3fea585de9 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 8fa2d07429a98ee2d992a7075d2325e68edb835e..dcedfc9ea64e6d193f0dd74a3aa383368daf70cc 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 48041ba6a0ec4d8de5780c22767b806e5cf79219..2eef6e0638df7d8b1dcfd66b78f901c3a7254bb3 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 1ff1cc6ce6928a60028ab3941b783935316bdb06..6363419584f8b50a5552b7c7f40f65f5303f1d0f 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 04d44681b251c10dcab8ab7c081e14ccbe1ddd46..064ce101aba600a1cff2cd11f9911d2743aa48d2 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 4e92a9ddeecfa6e83cb19a7c8b979052d1a55963..d64b43ced5f80a2f3df0c7e46ee17f3dbaa00a86 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 39d8e34e30654c858a921c3f4c7b5e6c6bffbbba..71ebcc764f24fe157855cb0897430ba250a0ec65 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 2d109fa5bfffb0adf81ce947b65c672cab19111b..3df797dc73120e27fd5ea537b996e8e39b689b7e 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 ed2849f116dcf1af04ca1054c81105d367508e8e..5a2a3dca8bb5ef3da4c0e8250397366d9a401ea3 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 f295867b4d58c2c6663389444687e7a30618de46..bc24cefef1f184cb51a035a8c1977dc9bfc9a948 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 aadbfe1123319f5bf39e71ed4d167f2dca790439..3dbeadfa48b31facd0d300ef39e148c12551c97a 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 ea0fffee9a7f75d84c8eb748f49edd42daec2df0..c8cb225cea98f1659412fa775f42eda3f242beb7 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 30de6a48c29668d9108ae878ccbdcd7b8d4df7e4..f4af5c3a21ebc863b2cacc1ff01dd725c20af0b5 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 b466b80571c44323ae063df8fd3f62830114c2ac..a63de4a32a856ca699320f23a167dcdcf7bf35c3 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 838a724b87f504bd008b4c75935df44770e5e106..80b2821d1da7a1c903febe2c7e6de47a7aafddeb 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 7c9a27a7fef2fd3a909aa6c0102c8c792feaaadc..7240d974ccf4c8f723c7555dc4805d7e1feeeab8 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 d1a538e1d846373639e93dd5302b9dd5cb039f96..cd110af74af28231eefdb59ab59a8c65d16ab81f 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 426c3b095c8c0518d2924500bd43f52fd9feae50..f070f2c57aa1dfede46090f4fcdb0e00f6fb30c1 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 54a26cf45099e52592058e2c017c789cbc81592e..a8d44ffb7823f7df013e4e222280394ef06baa4c 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 8996fc41686e01c596fd8a22f9746bf6ca37707c..06f20b1d502e33ce42c532e8fcb4e19663429e6a 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 c9c592bae44d42dba88efa5b816027fdaa6f4827..5ac80da29db3a45eac5b3d13779a3d398215399e 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 ecc30bbe35df43b33de3c0fbc5b614037febcc34..5e314aa7a30c03e50b57185fad04765fd288bbd0 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 4bc6290b9edddf9ff1de38a6b7137ea3040f6fae..3b98df4f8bf942cea5bad1286a242ec9d5c9d3cb 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 e15945cfda6f4985609da09f4516bd7789350de0..43392269f5e0cbcf980834b6e163fb37517fb552 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 c7489d2dd5b9a0fce44282c7be7d52d4c1a17dec..321f712a136f5376ed2b7555377aaf22fb625f0f 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 0497dd5a9c493ddbe7666a336ff162143d1146fe..d9d21b1bab04f7b77c72586224ea6751e6cc9f2c 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 2da581b9b19af35142cd505a1f419b8e9f00b621..1fb08a1f2a090a6911522d302612275320c24869 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 f49b90431551e1a6208f3d97c9dddaa28660e29f..8ddea41cfaaba1b8730698af1988c7b2964283f7 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 d32de2476377588cb6e5daeae3e575a5fa91e41f..1dd50528d6a82ca2e87487078dcc313265757159 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 ed2849f116dcf1af04ca1054c81105d367508e8e..5a2a3dca8bb5ef3da4c0e8250397366d9a401ea3 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 ce1a0c7a102b1b884421f0dd55814551763e76cb..42ab705d4b4547cac9794ee48801e7bd3ccdcae4 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 bfcbb8e430c02da80a8eada72f1c576e6bc801e7..b31c560838ef74170ce799efcde3ece6449b0412 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 0136ee4956860f82271c3caf3634d02c579a5500..c05ecb664f968ab726f4f8935866f835e74da52c 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 0266722c3eed9a9fbb9e8609a55db9f6378a728b..561c745f2086a89f171f376696ed6f1833c01591 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 c7489d2dd5b9a0fce44282c7be7d52d4c1a17dec..321f712a136f5376ed2b7555377aaf22fb625f0f 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 0497dd5a9c493ddbe7666a336ff162143d1146fe..d9d21b1bab04f7b77c72586224ea6751e6cc9f2c 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 d32de2476377588cb6e5daeae3e575a5fa91e41f..1dd50528d6a82ca2e87487078dcc313265757159 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 ed2849f116dcf1af04ca1054c81105d367508e8e..5a2a3dca8bb5ef3da4c0e8250397366d9a401ea3 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 ce1a0c7a102b1b884421f0dd55814551763e76cb..42ab705d4b4547cac9794ee48801e7bd3ccdcae4 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 bfcbb8e430c02da80a8eada72f1c576e6bc801e7..b31c560838ef74170ce799efcde3ece6449b0412 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 0136ee4956860f82271c3caf3634d02c579a5500..c05ecb664f968ab726f4f8935866f835e74da52c 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 9619bb6a41f0848a660dd211a0e79c70701c4415..a04d8030209ef92b414d64860ca94a4ae22fe7c5 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 7ef23250491db34e24745e7c66e5dd8e4279854a..8a82993641ecb76a9d5f9972441b49c1d205579f 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 5d68dd9c212b1afa3ce01b8cb928767580746810..b2d3df221a3a8ff49c968da6983045557526bfe8 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 175a720d420f222ef4d5e4d6f4d3cf9c160489a9..221682f4ddbbeef0b338b62eff19c4e9d416584c 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 ca9fc0cb05e1ffbb44099e1006591d689b3456b3..223f8638b715492cb4c12c228f1dd2ba8620e4c5 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 22d708273d807e6bcc9df090b7825f9e4df9abc7..dc0f2adb9570305894d01a7f8fd00969722f2ea7 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 d62e1dc69d9fdf259e9085b4cb244cbb45c77908..48fef07379d682958cc19c92a97e2824ebc71924 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 52ab6ff45d292078fa864e74c2e797f9606d8afb..743ce4fc309ad25381e447ecccb22acd0ae0b415 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 3c7288e537ecc3192fc995db2bf216f66fbc5c32..e63dce8b89428cd4ea1f091f950db215845b3ab5 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 9c6544c6afd401d41a5706e116825130a3316238..58cd648c23195c70ab68d0d4c98d5172b8c0b6ff 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 1b0ee77208140c37bf7f3c6eba63528a6901f9d2..90863d0008caccad11aa2316e690e8dba40b199e 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 6077fad3f223aaafdaaab1d5204407b715a1ad58..d59b0b961db55ccedaad7f249710c357bfe1db75 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 5b64ab44158fb6aaba2fdaf47b3fb4269d1991d2..6beef02a17b1e5ffbd73c5f6371006b846c1f6cf 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 29c6d25fc28e976f9f5dda8d925a98358fa80217..1c3b820742c4915e7532a71e85ff383820662f16 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 40271136e2c2137c3c587d2bcb502422b4bb7ac3..ebd81c03a7beb6d05e7ac6f02c9a49db9c3ba3f5 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 8f664e8bf126c9d9dd0f411b5722b68482bb182d..0b3933955826dc5fe3a81bead6c10258f6269df4 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 7fd16f0cea06e40c2974bc57934155f643aa58e2..7d0b9525a8a264c69d3d1c5504fa0f0399e102db 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 f9e71c5309960b7e45578f1fce1e92694db62db0..9c5de63c11f4402e8edcef19e4303e5922bc75a7 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 90343b56ac3d95f15ec1eaeb0a7038068f43b280..2c983759d2510ccd484074c6d61692048320a246 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 233c4343d14695a7f5a16a9f546b6054705a1709..cbc69653dccbbda08dde2d055797644381c4531c 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 0dc45607894f75a2716305110cf18d4aacff3844..3eb0fcb7227b3e61dba6afec785774fe08994e63 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 bdb44c1b2dd25e7ead299a951e07da606c8511e2..50e31d88ebb8d39acfd0bd4b927fb7e274bdc2a6 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 bfc805e1121644deb3746dd7155d364235a21236..6b63de0b0db8de035d847491d555a5433a67d0c9 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 52140f38fd8b27b899a6be49b1b538306ec756e9..f879841077ee5070cd93cc8c1fd1eb6bcc27fd83 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 514dec715fbdbcfdab88c511a5e2d98273a72fd1..828e94c684ae8ea8e70e36ec9bdbf283dd028317 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 1b0bbf35168f88d6c50175bc546b6a2b932b6d45..52497f93dba271132477a49e7ee113e62287d536 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 31b5aae46dce81f6782a941fe2d9cc6d7cd6b22f..c8f2f46c78a5970355a69419ffd849466ab6eb3f 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 1e1c3d714f43d7996b4d93473d9b0bbacbc6f7ad..6b47414cceac96bf1afac57b0f574f1724991295 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 5728f1fe9c2c2a068c441ae4b36163701d371b03..4f9057891369c5de94605d5ec657bf263e0bde79 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 04c1bdda521343526f990e1a4a009dd708415593..8de115172a21b226e2c06ef37b7c5c0c675b22e8 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 f09c54b9bd3f46baa9954a737e46c48d07bf322e..1b5ceda2bb059aa2e5f786f2c817c5343d91f352 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 9c6544c6afd401d41a5706e116825130a3316238..58cd648c23195c70ab68d0d4c98d5172b8c0b6ff 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 c26cbe92d9c8d24c2affdf95420164d971892060..ecbc97b07bcefc9209e27d599ee0337d1abbd987 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 cf8cd6635032e9975b465d27e4a0ea9ebc3d654c..be1aca140a9dc26c48b5e58be886db529eeeb12b 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 830a071b358387f2eafa9be022f4233dc0cd8e58..4525116709cfe909a2b67145b643cdf861eea9fe 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 31b5aae46dce81f6782a941fe2d9cc6d7cd6b22f..c8f2f46c78a5970355a69419ffd849466ab6eb3f 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 1e1c3d714f43d7996b4d93473d9b0bbacbc6f7ad..6b47414cceac96bf1afac57b0f574f1724991295 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 f09c54b9bd3f46baa9954a737e46c48d07bf322e..1b5ceda2bb059aa2e5f786f2c817c5343d91f352 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 9c6544c6afd401d41a5706e116825130a3316238..58cd648c23195c70ab68d0d4c98d5172b8c0b6ff 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 c26cbe92d9c8d24c2affdf95420164d971892060..ecbc97b07bcefc9209e27d599ee0337d1abbd987 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 cf8cd6635032e9975b465d27e4a0ea9ebc3d654c..be1aca140a9dc26c48b5e58be886db529eeeb12b 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 830a071b358387f2eafa9be022f4233dc0cd8e58..4525116709cfe909a2b67145b643cdf861eea9fe 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 3d52a64080c02faa2ec21ab5f7e6889fe6214ad0..987d1ae0bab34cf28771dc2481610722f1a2d355 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 13c022b6a19840f11478537e3e4a35b3b297785a..c66a96cb26f24c595c4f474fc7cab6abc58f0529 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 0194a099e414de44b9976ebf673104ab665b316d..b1de864909c09e1f145ff46f1d8c0628147d3fc3 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 95737a4625f8fcb82677dbbc69adfe1a3cdb2e06..e130100f2a17871c64453c8b98179c0c3f8c6b0b 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 ce2f734f7feadca44b02bfb48b8851ea0001ee98..7d010a02a8051c5e32adae34796dd273e5725bfa 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 c34f68bf4d15045e1090873a100ae46dc815389a..79c39fd4d0b3924290d4a249f119fed5752a94d7 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 23516d3b33062c7f92b06774a78598bce62a0448..b2ce4e74e7ca3fd09891fe7ba254c800e907e61b 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 2531e9e94df455a967e91d168bab83a1a3742b5e..6ad186cf0103f49b6f1226c38a415fb3bde147cc 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 a4188e5e7c45d83ec125bfe3b0278eefc7f8181c..1e9472990cd312916fe545e26c8c6223c37258d7 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 a4188e5e7c45d83ec125bfe3b0278eefc7f8181c..1e9472990cd312916fe545e26c8c6223c37258d7 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 c1ffeb5272449202ad17dfb3eb343d0b05fec632..380fc76c049e427692fe1cb8889e92c10ba329de 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 e015370b731e20cf79625accad09506374d4cc1a..091bafefc2fb3b8be33a799ddf344fd40e25a7be 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 e015370b731e20cf79625accad09506374d4cc1a..091bafefc2fb3b8be33a799ddf344fd40e25a7be 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 819c47d534df93aa85fa82cd9e24475381a5f48a..695bd84b0b78b5da5576fa8e2612c9e77e1b3b54 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 beb31556be171c82cfedd6b98aad39bb7a5748cb..ef86a7cb27ee5818d7fffde21d63f916e4cf2d01 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 b79243aab6fc3c0a4a05b75f9f1858bcd3ab8628..ac767de5ad0e5fe6b71e24c38900be49fb43567c 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 1c650253c0304c154a9f707825ae7b7e451f76a5..8e32c09156484ba2c9a3b4f93ebdbe4a9efd1b9a 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 fb7c6b0953cf2ce29571551fc45a70f27adfbeda..2e5b2cfcf7a51f25c2188953a8c9828582710ddb 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 8bd525593296a7b9e8ba867a2f159f7516a07f40..7d83877b0d3e7c51ad68e25c15fca71df0c147d3 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 165a020c96b85632ece7807215af40706f3fa01f..25f414ff0fc52344a10d2b31a2e76657af6222d5 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 b727a589513e8bbbd2bd309f44ad3edc6508aa0c..d372c4da48b6af913b34746694b0a8cb0b1cf72a 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 82f48d094789bc7b28288d64003dd8d281998d6a..eca307a911f3d45c54c9cbda9b3a52f2c6e4f1fd 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 e61c978a7e6b42b1ed448db276bc642077a9cb99..f8bd8b88d63b0f2f1127a2d2146d8aedbeb07d0a 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 550aa40463397cbd6c9efd2d24e594f0797b4669..548dfac1df83d3c00a89a2dcfa089207c4e71f05 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 989d2a256e4bb3a9d5d2a4d42b34c0aa6aef04b9..2c9b15279659bf5c46caf52ffe48ffc0accf0914 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 88b4301fc460f2fd9ea87379de81464a51392340..b4568b1988a9a9c79ad1eae01381044003717733 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 925ffe002dd757e6b94c17262432e36aeed6158b..a6dda8b6ec1c69223a84d4f7db5457e3a40a205f 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 1823b0c8e7a5e7d2d39b9a5ad9e39ce43a4377ac..45d69d0ca71b0edde0232f613c6cfa6ec7849e8d 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 eb23739c81b4f5bb1fe92f85e48b5b3bd0fcdb1a..c57823accdfde76f954a0433457fc4454a4265e1 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 ec5945aa5177d5577f18fcca60fafe1c2ee7d636..b827edfae701e64d3a02b51882e6e9c1eb20604d 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 5ceebe0702d4191b010cc3f25afd3ad9b9a6829f..68e1ec3319798b825143f01a61949950e3916245 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 5fde268ba0b4e5f2eba8e60061436c98b220160c..6aded18deb0a6fdf64c53105a75ce8df638cd8e7 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 be81bad9b717fdabbc62e5e8daddac043f8e1b13..466af9a8879a0102fea5a3506638a8e627c894af 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 895a18c1bc298e3355c8d9caea13190cf9105373..c6c266c23497bbee6acd5d48f4210ece44d5c40a 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 5e4367e1f009f24ef86978b3df7418bdb2e30f98..9d19abff1035ad27f483597d179e56e2d07e5128 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 e984162d6ba4bfa9117a0338631d7a4bd872e226..90d90a6dc56ee6bfdc5f5592a5c74efcf80c4205 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 239a6f12c6858242cb1445d9e6a8688206cfe44b..351c180a572f9fb43780dff67ec33c2f7bf9f335 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 1f44241b2b4d1383b46c6753c11033306fb7a998..322350c344ff1b16550d13e36ca133f01f2fe3eb 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 d80e4ebaf9de496e31e291d186b347a12560d56e..24f5d04eb6bb0e31e505366bab3a451feb44b474 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 3480ae65b39ac12c499113741ad88200b48eae63..381c6039f6f774a9e23d8a1d146f26745dc1c385 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 563cfca6241dcedc6505396c19c5bc3d4772d88e..688237db92d4b78162f58787b459b0c1236ec097 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 45875292ebf15e2a91ca6bf50b7a00c1195516b4..ce131776be7dc85ad6b6cc4e9c4484a6fdb36d58 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 71fc463354bdd762cd02e5ee4b5aef22853c938c..62d246f3ea1f6eb02e578e44adec3d277ac219ad 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 d601b57aada726361a19fe436c8f7724b182cef6..2ce4b0d4faafe2ea39c7ed02328f6065979d874f 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 cfa7785dbfb4fa893c41a6317b2b4eb0c5ba8387..22235ed71e0c5e797d575cc9f39f75097328e76b 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 7f8d900d8eb616c026eb88ab153f16636355a8c3..7774f6dbad52bbfd4162cf9f98c93fb00f0966b0 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 2ef19f74ba88f31030bcf86262563b4add93f375..34164201556e148c78ed407bcabb910b6ec0fc7b 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 5d8d015ca3b88e6eb9382b4e60749235eefd9670..95553d8749a21620ae9b56873bacd74317330d79 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 6d825d915a0ebaab5cb6de79e69059f7bcb92daa..4aded7122403e46a945df16d7585fb97af88983f 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 f6aa8b0575c5dbef1d3e5e1da1cac7f3c4d05ac0..13802c242466a92c4dd0869b30cf506db784ea6c 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 6b3feaa3a4b1c73fef1364e74a1eb9336b5019d2..8025d6ebbd8f5dafe30c31fcf8ee3956296136d4 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 818deea5bae5081fc3c67a140529636445e2a076..134e6363a0d9bcbb85ba78102b51225916185f0c 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 306876bd92c0e5d5a2b675922a973f79acdaec67..d13cd4e2eeb24c377f0bbd35f0b422aefa89f435 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 8bd5efceeb1a9167281467c4965251b018dfbbd6..35ca48027b7cee9ee8ebbaca893e75925ae9ffe3 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 7409213795c6c5b364e77515fffcb3af75d2f340..a0ac2a77a1ff953acf0597a06c079130c1dc5a1c 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 396ebc8154e6f78003810832d7d92e733df76cfc..e4f62201ba91a0a26303dfd335824a199822f991 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 7409213795c6c5b364e77515fffcb3af75d2f340..a0ac2a77a1ff953acf0597a06c079130c1dc5a1c 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 2c0a373c2a69258d5514c159823a12ebae5f7972..c1e6cf61170b8ece2518dffdd763eaa64178a9f2 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 c54f485993fa82f411fc5008450a3790e10192a7..9b8c0377460b9f57969a08d10068d20ee2eaeabb 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 ac01f444ed84dc00b3fb878d152068e93306a5a9..1b5f7e5cb24826fd4189024a10b839375ac8df78 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 51c592150cffede5ca05f29794c39593f940df43..8748d3679fadd0df15ba55bae9646abcd2818d7d 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 1e7776c617ed17064ce903cddf815c81255dbc12..6c4ae70da7269765fc35498b9f3834be4add9b4d 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 96c3fd790d4eb819a720f8dd768b251413f42404..f2dd74af6b4e05ba065d9da34d95933441fe3662 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 8bd5efceeb1a9167281467c4965251b018dfbbd6..35ca48027b7cee9ee8ebbaca893e75925ae9ffe3 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 4a0059165e8b54400b4232595b4ffd0098f31d0d..5f7d0611ac1c66c8901d0fef030d8e3cba80102d 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 09a5fa0dba6ab59b7a09cace120a75c73fff7e51..a375f863a43b71912e030e1553bcacc5298e6c47 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 029ec06f05c7188f0abe81a7c5769016d9a8ffe5..5e2378dcdd376df8611cc4392b20824eb53bcf8f 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 61cce76e0d5296567a2dc606f88807518329ad1e..8bf805ac1163291aba6c6f3f089784d0287a56a8 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 eae14497884ff17bb5adc2eb5f25bb13c5dd61a0..9e7f8cf4c19903362903fec6ee820dcc23887f75 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 4094f6dedb36fbc368fc03f2f2d0b35c364cd2a8..6a726fe899033689de13769acb5d9610e49f8f82 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 cd6320c157b0710f72396a0b4d23de7dcb3b5e17..ac7e05d10cb0c1b6c38e8b746d801d4daaf1410a 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 457fd42b11356d17672f11199e84025327e09dcb..e9d8fb9fa90f7f0eb6d246a9a9b2414b852acb1f 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 9fe334706c12f38a5dbfc6bbf2df8f2e6edc39a9..4689795c971b698c10413648ec8ea3d99ee1ef7a 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 e4943446e4ce0995830dd9cbeb40473b69a802b9..a8cef469c26b57253c31efb9d105461b514647ff 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 297886c54896d20f1373d88786e3ad39329e15f2..03011c1efa547063fde1c4dd8eb3c5dff908b4bc 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 239a6f12c6858242cb1445d9e6a8688206cfe44b..351c180a572f9fb43780dff67ec33c2f7bf9f335 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 3b589eaa4bec7a044e531af9f05281fd40a3b452..49575d36fd6ae75a68a540753a25a58227908bac 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 422ba782888546e943d34704e2104606c3a2bcd7..95c8265a0d3e61cc6589f7e050dc8badbadbe3f7 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 7bab0924b381b45610ee2a576fbbcb0acd6785a4..37b5f9d3f824d23ef277e37e9cc80576325425f2 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 c38a4b7b5f28b0f9274de50a4f0c698d0b1fca53..86836992311e34223206aca824ae04562e2c6e68 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 3e6f435ecc18b88f194e4d3544dd0184edfbc84d..47cd453fbf6bcb17bc337c5eaf9e165e1c115cc3 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 e8656e82ce18a9dfc451037563621510f8968a41..4a23879b7bb292e96126f73276790ed0a2493ee6 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 f726fbb0498311ef973ec3d6fc1befb7024af376..f3d5f6c2eb185a2b17b4a89586712cc2daacd742 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 be9213d7fbcca7c31992fe58ddfa88e6a20faeb2..754cd7a65655587bbe53bbafdf8aedcd9172710e 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 52cfe36afe058b160001e5d8997bdbe81c04180c..7750dc85203e7ea421e8498d94f86f795d52cc47 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 44d717d29157fe81b86d24553003e366f353e241..3b62a31d8b094a0a8e4ae594312ffef69c31f535 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 109a1e9d6c74f835f7dcd3524023a0d1f0d13d94..35b7a743d83d1ef34e99562466065e02fbda179e 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 6967992f3c4b339e73902d448a0c3a0fcb8a0e3b..e88d67bb815a6c50ca30a28b3c4bac9cbaccdcaa 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 f16aaea3525aba515ebcaa310be6372d111407ba..7f2773340a05dc7835209cfdef2908e6de322b87 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 3c2e914f0492485971e371bfb4e1ad82b46c01de..f0c5323d7f045766d5295e6d74044208cf931391 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 800404388b1d1eeb29b0e6e95e0036ee899d008f..915263dc7c5ce124146e301867394ce9c8641015 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 9ca5fd92edd3b56df9d496f329c03a66c296c23b..31dc54f7a23f537a73e03e651f86716b7cadeee9 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 4094f6dedb36fbc368fc03f2f2d0b35c364cd2a8..6a726fe899033689de13769acb5d9610e49f8f82 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 cd6320c157b0710f72396a0b4d23de7dcb3b5e17..ac7e05d10cb0c1b6c38e8b746d801d4daaf1410a 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 457fd42b11356d17672f11199e84025327e09dcb..e9d8fb9fa90f7f0eb6d246a9a9b2414b852acb1f 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 9fe334706c12f38a5dbfc6bbf2df8f2e6edc39a9..4689795c971b698c10413648ec8ea3d99ee1ef7a 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 79d12787bc7e116eabb88c1de534781d0649aed4..be85e2916ac696269fedc57661b9fc2672ead543 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 297886c54896d20f1373d88786e3ad39329e15f2..03011c1efa547063fde1c4dd8eb3c5dff908b4bc 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 239a6f12c6858242cb1445d9e6a8688206cfe44b..351c180a572f9fb43780dff67ec33c2f7bf9f335 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 3b589eaa4bec7a044e531af9f05281fd40a3b452..49575d36fd6ae75a68a540753a25a58227908bac 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 422ba782888546e943d34704e2104606c3a2bcd7..95c8265a0d3e61cc6589f7e050dc8badbadbe3f7 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 7bab0924b381b45610ee2a576fbbcb0acd6785a4..37b5f9d3f824d23ef277e37e9cc80576325425f2 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 7f8d900d8eb616c026eb88ab153f16636355a8c3..7774f6dbad52bbfd4162cf9f98c93fb00f0966b0 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 c38a4b7b5f28b0f9274de50a4f0c698d0b1fca53..86836992311e34223206aca824ae04562e2c6e68 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 3e6f435ecc18b88f194e4d3544dd0184edfbc84d..47cd453fbf6bcb17bc337c5eaf9e165e1c115cc3 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 e8656e82ce18a9dfc451037563621510f8968a41..4a23879b7bb292e96126f73276790ed0a2493ee6 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 f726fbb0498311ef973ec3d6fc1befb7024af376..f3d5f6c2eb185a2b17b4a89586712cc2daacd742 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 be9213d7fbcca7c31992fe58ddfa88e6a20faeb2..754cd7a65655587bbe53bbafdf8aedcd9172710e 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 52cfe36afe058b160001e5d8997bdbe81c04180c..7750dc85203e7ea421e8498d94f86f795d52cc47 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 44d717d29157fe81b86d24553003e366f353e241..3b62a31d8b094a0a8e4ae594312ffef69c31f535 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 109a1e9d6c74f835f7dcd3524023a0d1f0d13d94..35b7a743d83d1ef34e99562466065e02fbda179e 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 6967992f3c4b339e73902d448a0c3a0fcb8a0e3b..e88d67bb815a6c50ca30a28b3c4bac9cbaccdcaa 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 7754dfc2e1411e8c2b4d40582f6efedcfb285660..0941cff7b29712ef8d9d7f1c435d0c5d923b68fe 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 3c2e914f0492485971e371bfb4e1ad82b46c01de..f0c5323d7f045766d5295e6d74044208cf931391 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 800404388b1d1eeb29b0e6e95e0036ee899d008f..915263dc7c5ce124146e301867394ce9c8641015 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 d71bcf3ebf7600a03db0911f2dfc4b9eb76ed735..f354f9f60b8bb9638cc7bdb087473e2202a9266c 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 a98b750b7e7e103cbe0ff83b9a6a2304c7c6c902..4b1c380c6e831e30f156311c279bc4add9877343 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 00bec6192927d7dcc469df05cd1ddd9ca923ff19..89d86eb35e8bebefc645efe028e1f59e463260d0 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 088aeebbe48d05cc9b55aa65d55524279c525e78..feb5fe80f44778ba536c8ed2eba371544b41e136 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 935608a9ce513902205422220d108a159b826cdb..860f4e2660c23a8ddf2363eedc79de639e928168 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 b32c85842efc4e89c58a7a07daf35b76f39520c5..3882ccc4b654f1cc66e4eb302527d48b09296a2a 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 bda8656eeb400cfd1c6b92b7e9c7511f6241b228..17d954c611c2d4584d2bc07462500433a4f435c5 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 8f4f842c8725b65a17f4ea8d3dd348cbe1d1d328..7b2a297c8d9dbbe27d38e00f14634db9979cca3f 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 7ff65881a3c53bfb237da058b75d3e9c3943ca3a..bef1b6a29815ae27371997a7e88cf1339bae1857 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 221894a865d373611543a3c9503d7853467ef090..3b898e59a5c39a41b43c287a952a74424c88a7b1 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 3cdd6477dc60adda91b768050d5e0cb4d02999e1..98ff5657eddb52c48b2ada0cc04cc0dc88e61362 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 0d3770a2c5a4ebc5e021171a61ff9e854d380276..19794e25a6693cbc8488d0972c23df2bc2ba80cd 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 f5b5dc8a3e603f802b3be8ab90eaea21842f709b..4a73a73ec9d9945dda50010b520d842d292076dc 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 364c61d721145862d1f21ba2c6c1288390396d8b..193f15c8054be32928c95d0ed02aeae92de77c2c 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 fb76dea786c5fb6e21126b1a917cafea2b70c145..dbc975a5d645edfd3005525732d18d099cf7b4a0 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 e1f8c0cbbdbfd9c4a1805f3587b843ca6761321c..d638e25f1e7e13c316c9fa608c9bbb4ac3aee0d1 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 ad2c46a9dbbe86896b45d9732947ed70c562d4cc..f0fd0393b8ce7a5f6807992718b750cd7ba4e2f7 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>