From: Helmut Hummel Date: Sat, 4 Nov 2017 00:59:24 +0000 (+0200) Subject: Revert "[BUGFIX] Set _localizedUid in OriginColumnName" X-Git-Tag: v9.0.0~288 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/641611f4bbc53de256cbf1b9d68ac85c94204ca6 Revert "[BUGFIX] Set _localizedUid in OriginColumnName" This reverts commit 68e8530319faea18fbc61eee55fc00298582e8de. The patch needs to be reverted due to wrong implementation. The desired goal is not achievable at all with the current code base. Reverts: #66535 Releases: master, 8.7 Change-Id: Ibd8eb7c4023d1b9f0e0de8b75d66193d66b89147 Reviewed-on: https://review.typo3.org/54551 Reviewed-by: Wouter Wolters Tested-by: TYPO3com Reviewed-by: Nicole Cordes Tested-by: Nicole Cordes Reviewed-by: Markus Klein Tested-by: Markus Klein --- diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php index c052a65ea379..63ec1c45dff2 100644 --- a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php +++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php @@ -763,7 +763,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $dataMap = $this->dataMapper->getDataMap(get_class($parentObject)); $columnMap = $dataMap->getColumnMap($propertyName); $parentUid = $parentObject->getUid(); - if (!empty($parentObject->_getProperty('_localizedUid'))) { + if ($parentObject->_getProperty('_localizedUid') !== null) { $parentUid = $parentObject->_getProperty('_localizedUid'); } $row = [ @@ -935,7 +935,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface $row['uid'] = $object->getUid(); if ($dataMap->getLanguageIdColumnName() !== null) { $row[$dataMap->getLanguageIdColumnName()] = (int)$object->_getProperty('_languageUid'); - if (!empty($object->_getProperty('_localizedUid'))) { + if ($object->_getProperty('_localizedUid') !== null) { $row['uid'] = $object->_getProperty('_localizedUid'); } } diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php index e6af94735df9..2e55f63235c6 100644 --- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php +++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php @@ -233,7 +233,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface $dataMap = $this->getDataMap($className); $object->_setProperty('uid', (int)$row['uid']); $object->_setProperty('pid', (int)$row['pid']); - $object->_setProperty('_localizedUid', (int)$row[$dataMap->getTranslationOriginColumnName()]); + $object->_setProperty('_localizedUid', (int)$row['uid']); $object->_setProperty('_versionedUid', (int)$row['uid']); if ($dataMap->getLanguageIdColumnName() !== null) { $object->_setProperty('_languageUid', (int)$row[$dataMap->getLanguageIdColumnName()]);