From 7d0ed02e19b3b19ae6ed1a5615d0dbbf5090d8be Mon Sep 17 00:00:00 2001 From: Georg Ringer Date: Fri, 2 Aug 2019 21:18:33 +0200 Subject: [PATCH] [BUGFIX] Fill alternative language keys correctly This change adds the language dependencies individually to the array instead of completely overwriting them as a string. Since the dependencies are iterated in the core, this function only adds to the array instead of overwriting the first index. Resolves: #88045 Releases: master, 9.5 Change-Id: I3101bf8f9873ffa5ceeee3cc9e9ace36858f39a4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/61406 Tested-by: TYPO3com Tested-by: Andreas Fernandez Reviewed-by: Andreas Fernandez --- typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php index 3a7027ec2936..40d9e11ad565 100644 --- a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php +++ b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php @@ -199,7 +199,7 @@ protected static function getLanguageKeys(): array } elseif (isset($tsfe->config['config']['language'])) { $languageKeys['languageKey'] = $tsfe->config['config']['language']; if (isset($tsfe->config['config']['language_alt'])) { - $languageKeys['alternativeLanguageKeys'] = $tsfe->config['config']['language_alt']; + $languageKeys['alternativeLanguageKeys'][] = $tsfe->config['config']['language_alt']; } } @@ -207,7 +207,7 @@ protected static function getLanguageKeys(): array $locales = GeneralUtility::makeInstance(Locales::class); if (in_array($languageKeys['languageKey'], $locales->getLocales())) { foreach ($locales->getLocaleDependencies($languageKeys['languageKey']) as $language) { - $languageKeys['alternativeLanguageKeys'] = $language; + $languageKeys['alternativeLanguageKeys'][] = $language; } } }