diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php index b909a23adae60d52686be8c80b6c42ab8784055c..2ac0fd31fb688ce9e749b036a3b0b1a1e78b3041 100644 --- a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php +++ b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php @@ -217,8 +217,9 @@ class InlineControlContainer extends AbstractContainer $resultArray['inlineData'] = $this->inlineData; // @todo: It might be a good idea to have something like "isLocalizedRecord" or similar set by a data provider + $uidOfDefaultRecord = $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']]; $isLocalizedParent = $language > 0 - && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']][0] > 0 + && ($uidOfDefaultRecord[0] ?? $uidOfDefaultRecord) > 0 && MathUtility::canBeInterpretedAsInteger($row['uid']); $numberOfFullLocalizedChildren = 0; $numberOfNotYetLocalizedChildren = 0; diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php index c9c27a0c3802f29073447b8b07e0186601064e59..fc95703ed33b5519ea7d50c8814ccc0fc96ab2f9 100644 --- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php +++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php @@ -182,9 +182,13 @@ class TcaInline extends AbstractDatabaseRecordProvider implements FormDataProvid } $result['databaseRow'][$fieldName] = implode(',', $connectedUidsOfLocalizedOverlay); if ($result['inlineCompileExistingChildren']) { + $tableNameWithDefaultRecords = $result['tableName']; + if ($tableNameWithDefaultRecords === 'pages_language_overlay') { + $tableNameWithDefaultRecords = 'pages'; + } $connectedUidsOfDefaultLanguageRecord = $this->resolveConnectedRecordUids( $result['processedTca']['columns'][$fieldName]['config'], - $result['tableName'], + $tableNameWithDefaultRecords, $result['defaultLanguageRow']['uid'], $result['defaultLanguageRow'][$fieldName] );