Skip to content
Snippets Groups Projects
Commit 19889aa8 authored by Christian Eßl's avatar Christian Eßl Committed by Benni Mack
Browse files

[BUGFIX] Check if language is accessible in PageContentErrorHandler

The changes made in #90135 introduced a regression, that made the
PageContentErrorHandler ignore the enabled flag of the requested
language.

Resolves: #91013
Related: #90135
Related: #87865
Releases: master, 9.5
Change-Id: I23504caab2f060c49f112d7bc529e71d02939486
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64131


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarOliver Bartsch <bo@cedev.de>
Reviewed-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
parent 0ad328c2
No related merge requests found
......@@ -120,7 +120,7 @@ class PageContentErrorHandler implements PageErrorHandlerInterface
/** @var SiteLanguage $requestLanguage */
$requestLanguage = $request->getAttribute('language', null);
// Try to get the current request language from the site that was found above
if ($requestLanguage instanceof SiteLanguage) {
if ($requestLanguage instanceof SiteLanguage && $requestLanguage->isEnabled()) {
try {
$language = $site->getLanguageById($requestLanguage->getLanguageId());
} catch (\InvalidArgumentException $e) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment