diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php index 4c335db64f35bf946634b6c4c0434343bab81c7c..753c5962ab40335dccb64946b3682a59f2e09bd4 100644 --- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php +++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php @@ -537,7 +537,7 @@ class Typo3DbBackend implements BackendInterface, SingletonInterface } // Currently this needs to return the default record (OVERLAYS_MIXED) if no translation is found //however this is a hack and should actually use the overlay functionality as given in the original LanguageAspect. - $customLanguageAspect = new LanguageAspect($languageUid, $languageUid, LanguageAspect::OVERLAYS_MIXED); + $customLanguageAspect = new LanguageAspect($languageUid, $languageUid, LanguageAspect::OVERLAYS_MIXED, $languageAspect->getFallbackChain()); $row = $pageRepository->getLanguageOverlay($tableName, $row, $customLanguageAspect); } } elseif (is_array($row)) { diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php index 9f9ed26fab4e85638b90c8606e775ad78dafcaa7..3f9184fd0d62be76e952d863b6bde1e9e07b693e 100644 --- a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php +++ b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php @@ -566,12 +566,11 @@ final class TranslatedSiteContentTest extends FunctionalTestCase 'visibleRecordHeaders' => ['[Translate to Polski:] Regular Element #1', 'Regular Element #2', 'Regular Element #3'], ], // Expected behaviour: - // Element #3 is not translated in PL and it is translated in DA. It's not shown as fallback chain is not related to single CE level - // but on page level - and this page is translated to Polish, so no fallback is happening + // Element #3 is shown from DA. Element #3 from PL is not translated, but a fallback to DA is defined [ 'fallbackType' => 'fallback', 'fallbackChain' => ['DA', 'EN'], - 'visibleRecordHeaders' => ['[Translate to Polski:] Regular Element #1', 'Regular Element #2', 'Regular Element #3'], + 'visibleRecordHeaders' => ['[Translate to Polski:] Regular Element #1', 'Regular Element #2', '[Translate to Dansk:] Regular Element #3'], ], // Expected behaviour: // Non translated default language elements are not shown, because of strict mode