Merge pull request #18 from pluswerk/bugfix/fix-user-info

pluswerk · Aug 18, 2023 · b458e09 · b458e09
2 parents dc01ab6 + 3aba9a2
commit b458e09
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/Service/ScopeConfig.php b/Classes/Service/ScopeConfig.php
@@ -56,12 +56,12 @@ protected function getUserContext(): array
 
         if ($applicationType === 'frontend') {
             $username = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('frontend.user', 'username');
-            $userAuthentication = $GLOBALS['TSFE']->fe_user;
+            $userAuthentication = ($GLOBALS['TSFE'] ?? null)?->fe_user;
         }
 
         if ($applicationType !== 'cli' && !$username) {
             $username = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('backend.user', 'username');
-            $userAuthentication = $GLOBALS['BE_USER'];
+            $userAuthentication = $GLOBALS['BE_USER'] ?? null;
         }
 
         $user = [];