Skip to content

Commit 64cc93f

Browse files
committed
[BUGFIX] Replace PageRepository->enableFields usage #2769
1 parent 39dc145 commit 64cc93f

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

Classes/Domain/Repository/NewsRepository.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use TYPO3\CMS\Core\Context\LanguageAspect;
2222
use TYPO3\CMS\Core\Database\ConnectionPool;
2323
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
24+
use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
2425
use TYPO3\CMS\Core\Http\ApplicationType;
2526
use TYPO3\CMS\Core\Utility\GeneralUtility;
2627
use TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface;
@@ -384,8 +385,19 @@ public function countByDate(DemandInterface $demand): array
384385
}
385386

386387
if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
387-
// @extensionScannerIgnoreLine
388-
$sql .= $GLOBALS['TSFE']->sys_page->enableFields('tx_news_domain_model_news');
388+
$queryBuilder = $connection->createQueryBuilder();
389+
$queryBuilder->getRestrictions()->removeAll();
390+
$queryBuilder->getRestrictions()->add(
391+
GeneralUtility::makeInstance(FrontendRestrictionContainer::class)
392+
);
393+
$queryBuilder->from('tx_news_domain_model_news');
394+
395+
$enableFieldsSql = (string)$queryBuilder
396+
->getRestrictions()
397+
->buildExpression(['tx_news_domain_model_news' => 'tx_news_domain_model_news'], $queryBuilder->expr());
398+
if ($enableFieldsSql !== '') {
399+
$sql .= ' AND ' . $enableFieldsSql;
400+
}
389401
} else {
390402
$expressionBuilder = $connection
391403
->createQueryBuilder()

0 commit comments

Comments
 (0)