From 588c0c12402afa8854dcb267e9b69bec6719e3dd Mon Sep 17 00:00:00 2001 From: Benjamin Serfhos Date: Mon, 27 Jan 2020 15:36:41 +0100 Subject: [PATCH] [BUGFIX] Manually add restrictions for sys_note As the RestrictionContainer also added the be_users restrictions, the query was not handling the public internal notes correctly. The Restrictions are now deleted and manually added in the QueryBuilder. Resolves: #90216 Releases: master, 9.5 Change-Id: I4078de3a05ca953408fe11d5d42122c213e41bda --- .../Classes/Domain/Repository/SysNoteRepository.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php index 153272719a..9d8486cdc9 100644 --- a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php +++ b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php @@ -43,6 +43,7 @@ class SysNoteRepository $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) ->getQueryBuilderForTable('sys_note'); + $queryBuilder->getRestrictions()->removeAll(); $res = $queryBuilder ->select('sys_note.*', 'be_users.username', 'be_users.realName') ->from('sys_note') @@ -53,10 +54,11 @@ class SysNoteRepository $queryBuilder->expr()->eq('sys_note.cruser', $queryBuilder->quoteIdentifier('be_users.uid')) ) ->where( + $queryBuilder->expr()->eq('sys_note.deleted', 0), $queryBuilder->expr()->in('sys_note.pid', $queryBuilder->createNamedParameter($pids, Connection::PARAM_INT_ARRAY)), $queryBuilder->expr()->orX( - $queryBuilder->expr()->in('sys_note.personal', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)), - $queryBuilder->expr()->in('sys_note.cruser', $queryBuilder->createNamedParameter($author, \PDO::PARAM_INT)) + $queryBuilder->expr()->eq('sys_note.personal', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)), + $queryBuilder->expr()->eq('sys_note.cruser', $queryBuilder->createNamedParameter($author, \PDO::PARAM_INT)) ) ) ->orderBy('sorting', 'asc') -- 2.21.1 (Apple Git-122.3)