diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php index ed65d410066a821816d76d3cea7215cfcb39d3c3..139986a24cc2cefc49d200d9cc974c3c00a78645 100644 --- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php +++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php @@ -738,7 +738,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface protected function getPageAndRootline(ServerRequestInterface $request) { $requestedPageRowWithoutGroupCheck = []; - $this->resolveTranslatedPageId(); + $this->page = $this->sys_page->getPage($this->id); if (empty($this->page)) { // If no page, we try to find the page above in the rootLine. // Page is 'not found' in case the id itself was not an accessible page. code 1 @@ -902,25 +902,6 @@ class TypoScriptFrontendController implements LoggerAwareInterface } } - /** - * If $this->id contains a translated page record, this needs to be resolved to the default language - * in order for all rootline functionality and access restrictions to be in place further on. - * - * Additionally, if a translated page is found, LanguageAspect is set as well. - */ - protected function resolveTranslatedPageId() - { - $this->page = $this->sys_page->getPage($this->id); - // Accessed a default language page record, nothing to resolve - if (empty($this->page) || (int)$this->page[$GLOBALS['TCA']['pages']['ctrl']['languageField']] === 0) { - return; - } - $languageId = (int)$this->page[$GLOBALS['TCA']['pages']['ctrl']['languageField']]; - $this->page = $this->sys_page->getPage($this->page[$GLOBALS['TCA']['pages']['ctrl']['transOrigPointerField']]); - $this->context->setAspect('language', GeneralUtility::makeInstance(LanguageAspect::class, $languageId)); - $this->id = (int)$this->page['uid']; - } - /** * Checks if visibility of the page is blocked upwards in the root line. *