diff --git a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php index 2c4e194bed7ec8c2a3a2e4929aabfec3b91dce4e..6246473b4e945b8b5e840a37226c5b404b2572bf 100644 --- a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php +++ b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php @@ -206,8 +206,10 @@ class LocalizationUtility } } } - } elseif ($GLOBALS['BE_USER']->uc['lang'] !== '') { + } elseif (!empty($GLOBALS['BE_USER']->uc['lang'])) { self::$languageKey = $GLOBALS['BE_USER']->uc['lang']; + } elseif (!empty(self::getLanguageService()->lang)) { + self::$languageKey = self::getLanguageService()->lang; } }