From ff87f24a51c3fe7615e0746b9817696d88c4f994 Mon Sep 17 00:00:00 2001
From: Markus Hoelzle <typo3@markus-hoelzle.de>
Date: Tue, 25 Jul 2017 16:11:16 +0200
Subject: [PATCH] [TASK] Make $permClause parameter optional in QueryGenerator
The 3rd parameter is optional, so the 4th parameter should be
optional too.
Resolves: #81965
Releases: master
Change-Id: I4240824717a0a18c0aa669ef891ce3b42b2fbc7c
Reviewed-on: https://review.typo3.org/53585
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Joerg Boesche <typo3@joergboesche.de>
Tested-by: Joerg Boesche <typo3@joergboesche.de>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
---
.../core/Classes/Database/QueryGenerator.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
index 30eac164aa76..52e92a47fc68 100644
--- a/typo3/sysext/core/Classes/Database/QueryGenerator.php
+++ b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -1541,7 +1541,7 @@ class QueryGenerator
* @param string $permClause
* @return string
*/
- public function getTreeList($id, $depth, $begin = 0, $permClause)
+ public function getTreeList($id, $depth, $begin = 0, $permClause = '')
{
$depth = (int)$depth;
$begin = (int)$begin;
@@ -1557,13 +1557,13 @@ class QueryGenerator
if ($id && $depth > 0) {
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
- $statement = $queryBuilder->select('uid')
+ $queryBuilder->select('uid')
->from('pages')
- ->where(
- $queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($id, \PDO::PARAM_INT)),
- QueryHelper::stripLogicalOperatorPrefix($permClause)
- )
- ->execute();
+ ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($id, \PDO::PARAM_INT)));
+ if ($permClause !== '') {
+ $queryBuilder->andWhere(QueryHelper::stripLogicalOperatorPrefix($permClause));
+ }
+ $statement = $queryBuilder->execute();
while ($row = $statement->fetch()) {
if ($begin <= 0) {
$theList .= ',' . $row['uid'];
--
GitLab