[BUGFIX] Fix missing frontend.typoscript request attribute while inde…

…xing Fixes: #3751
TYPO3-Solr · Oct 12, 2023 · 7ad5aca · 7ad5aca
1 parent 358c49f
commit 7ad5aca
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Classes/FrontendEnvironment/Tsfe.php b/Classes/FrontendEnvironment/Tsfe.php
@@ -167,11 +167,11 @@ protected function initializeTsfe(int $pageId, int $language = 0, ?int $rootPage
 
             $backedUpBackendUser = $GLOBALS['BE_USER'] ?? null;
             try {
+                $serverRequest = $serverRequest->withAttribute('frontend.controller', $tsfe);
                 $tsfe->determineId($serverRequest);
-                $serverRequest->withAttribute('frontend.controller', $tsfe);
                 $tsfe->no_cache = false;
-                // @todo T12: Check if following line really needed
-                $tsfe->getFromCache($serverRequest);
+                /** @var ServerRequest $serverRequest */
+                $serverRequest = $tsfe->getFromCache($serverRequest);
                 // The manual releasing of locks is low level api and should be avoided in EXT:solr.
                 $tsfe->releaseLocks();
 
@@ -193,6 +193,7 @@ protected function initializeTsfe(int $pageId, int $language = 0, ?int $rootPage
                 $GLOBALS['BE_USER'] = $backedUpBackendUser;
             }
 
+            $this->serverRequestCache[$cacheIdentifier] = $serverRequest;
             $this->tsfeCache[$cacheIdentifier] = $tsfe;
         }