From 0fb7fe8ab14f2c75d7dd50f224138de6d3cdf18c Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Sun, 12 Feb 2017 21:26:58 +0100
Subject: [PATCH] [BUGFIX] DataMapProcessor does not exclude workspace versions
DataMapProcessor, used to resolve and handle the language synchronization
feature, does not exclude workspace versions correctly. That's why it
might happen, that inline records are not correctly synchronized in the
live workspace if translations exist in any workspace.
Resolves: #79769
Releases: master
Change-Id: Id1d724ae38aeddefbe82a316624a75315d1a93f1
Reviewed-on: https://review.typo3.org/51647
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
Reviewed-by: Thomas Hohn <thomas@hohn.dk>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Classes/DataHandling/Localization/DataMapProcessor.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
index 999e39bc62ea..01dd6b0a0c30 100644
--- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
+++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
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\RelationHandler;
use TYPO3\CMS\Core\DataHandling\DataHandler;
@@ -537,7 +538,8 @@ class DataMapProcessor
->getQueryBuilderForTable($tableName);
$queryBuilder->getRestrictions()
->removeAll()
- ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
+ ->add(GeneralUtility::makeInstance(DeletedRestriction::class))
+ ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, $this->backendUser->workspace, false));
$statement = $queryBuilder
->select(...array_values($fieldNames))
->from($tableName)
@@ -666,7 +668,8 @@ class DataMapProcessor
->getQueryBuilderForTable($tableName);
$queryBuilder->getRestrictions()
->removeAll()
- ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
+ ->add(GeneralUtility::makeInstance(DeletedRestriction::class))
+ ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class, $this->backendUser->workspace, false));
$zeroParameter = $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT);
$idsParameter = $queryBuilder->createNamedParameter($ids, Connection::PARAM_INT_ARRAY);
--
GitLab