[BUGFIX] Recycler does not show workspace records in live

The patch fixes a couple of database restrictions to prevent
the recycler from showing workspace related records in live
workspace.
Note there are further issues with the recycler in workspace
context. Those need work on workspace record lifecycles first,
and are not tackled with the patch.

Resolves: #92056
Related: #21299
Releases: master, 10.4
Change-Id: Ib2d9a14231d01a861c731f4ce39b8f0cf5eddc73
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65414
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>

typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php

@@ -23,7 +23,7 @@
 use TYPO3\CMS\Core\Database\Platform\PlatformInformation;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -163,7 +163,6 @@ protected function setData($id, $table, $depth, $filter)
         if (!empty($this->limit)) {
             // count the number of deleted records for this pid
             $queryBuilder = $this->getFilteredQueryBuilder($table, $id, $depth, $filter);
-            $queryBuilder->getRestrictions()->removeAll();
 
             $deletedCount = (int)$queryBuilder
                 ->count('*')
@@ -264,9 +263,8 @@ protected function getFilteredQueryBuilder(string $table, int $pid, int $depth,
     {
         $pidList = $this->getTreeList($pid, $depth);
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($table);
-        $queryBuilder->getRestrictions()
-            ->removeAll()
-            ->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+        $queryBuilder->getRestrictions()->removeAll()
+            ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->getBackendUser()->workspace));
 
         // create the filter WHERE-clause
         $filterConstraint = null;
@@ -437,7 +435,8 @@ public function undeleteData($recordsArray, $recursive = false)
     protected function getDeletedParentPages($uid, &$pages = [])
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-        $queryBuilder->getRestrictions()->removeAll();
+        $queryBuilder->getRestrictions()->removeAll()
+            ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->getBackendUser()->workspace));
         $record = $queryBuilder
             ->select('uid', 'pid')
             ->from('pages')
@@ -533,7 +532,8 @@ protected function resolveTree(int $id, int $depth, int $begin = 0, string $perm
         }
         if ($depth > 0) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-            $queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(BackendWorkspaceRestriction::class));
+            $queryBuilder->getRestrictions()->removeAll()
+                ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->getBackendUser()->workspace));
             $statement = $queryBuilder->select('uid')
                 ->from('pages')
                 ->where(