[BUGFIX] Never load disabled domains in TSFE 74/54274/4
authorMarkus Klein <markus.klein@typo3.org>
Tue, 3 Oct 2017 16:18:26 +0000 (18:18 +0200)
committerBenni Mack <benni@typo3.org>
Thu, 5 Oct 2017 04:30:17 +0000 (06:30 +0200)
This fixes an inappropriate transformation of old enableFields
condition to doctrine.

This is a regression fix to #77400.

Resolves: #82661
Related: #77400
Releases: master, 8.7
Change-Id: Ic18c9e5f59b48f30651a988c5ec9d243c8b186e3
Reviewed-on: https://review.typo3.org/54274
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Johannes Kasberger <johannes.kasberger@reelworx.at>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php

index d47a979..81abba9 100644 (file)
@@ -24,9 +24,9 @@ use TYPO3\CMS\Core\Charset\CharsetConverter;
 use TYPO3\CMS\Core\Controller\ErrorPageController;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
+use TYPO3\CMS\Core\Database\Query\Restriction\DefaultRestrictionContainer;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\EndTimeRestriction;
-use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
 use TYPO3\CMS\Core\Database\Query\Restriction\StartTimeRestriction;
 use TYPO3\CMS\Core\Error\Http\PageNotFoundException;
 use TYPO3\CMS\Core\Error\Http\ServiceUnavailableException;
@@ -4362,7 +4362,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
             $sysDomainData = $runtimeCache->get($entryIdentifier);
         } else {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_domain');
-            $queryBuilder->setRestrictions(GeneralUtility::makeInstance(FrontendRestrictionContainer::class));
+            $queryBuilder->setRestrictions(GeneralUtility::makeInstance(DefaultRestrictionContainer::class));
             $result = $queryBuilder
                 ->select('uid', 'pid', 'domainName', 'forced')
                 ->from('sys_domain')