From 7971bc94b91a369cb170af2a2a0fb1530553bdc1 Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Sun, 17 May 2020 13:46:11 +0200
Subject: [PATCH] [BUGFIX] Prevent null pointer exception in
LocalizationUtility
Resolves: #91345
Releases: master
Change-Id: I54ab67e85b3bf24b06916b674765ed22fb5de76c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64508
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Josef Glatz <josefglatz@gmail.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
---
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
index 8ef85baf5d51..a138d0444c36 100644
--- a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
@@ -196,7 +196,9 @@ class LocalizationUtility
$siteLanguage = self::getCurrentSiteLanguage();
// Get values from site language
- $languageKeys['languageKey'] = $siteLanguage->getTypo3Language();
+ if ($siteLanguage !== null) {
+ $languageKeys['languageKey'] = $siteLanguage->getTypo3Language();
+ }
$locales = GeneralUtility::makeInstance(Locales::class);
if (in_array($languageKeys['languageKey'], $locales->getLocales())) {
--
GitLab