[BUGFIX] Have backend layouts in DB respect workspace versions

Resolves: #24737
Releases: master, 9.5
Change-Id: I5a5f1b0a26951266a0e90c46af670602247693e5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62214
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>

typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php

@@ -14,8 +14,11 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
+use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
 use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -70,14 +73,7 @@ public function getBackendLayout($identifier, $pageId)
             return $this->createDefaultBackendLayout();
         }
 
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($this->tableName);
-        $data = $queryBuilder
-            ->select('*')
-            ->from($this->tableName)
-            ->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($identifier, \PDO::PARAM_INT)))
-            ->execute()
-            ->fetch();
+        $data = BackendUtility::getRecordWSOL($this->tableName, $identifier);
 
         if (is_array($data)) {
             $backendLayout = $this->createBackendLayout($data);
@@ -147,6 +143,13 @@ protected function getLayoutData($fieldName, array $pageTsConfig, $pageUid)
         // Add layout records
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($this->tableName);
+        $queryBuilder->getRestrictions()
+            ->add(
+                GeneralUtility::makeInstance(
+                    WorkspaceRestriction::class,
+                    GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('workspace', 'id')
+                )
+            );
         $queryBuilder
             ->select('*')
             ->from($this->tableName)
@@ -192,9 +195,15 @@ protected function getLayoutData($fieldName, array $pageTsConfig, $pageUid)
             $queryBuilder->orderBy($GLOBALS['TCA'][$this->tableName]['ctrl']['sortby']);
         }
 
-        $results = $queryBuilder
-            ->execute()
-            ->fetchAll();
+        $statement = $queryBuilder->execute();
+
+        $results = [];
+        while ($record = $statement->fetch()) {
+            BackendUtility::workspaceOL($this->tableName, $record);
+            if (is_array($record)) {
+                $results[$record['t3ver_oid'] ?: $record['uid']] = $record;
+            }
+        }
 
         return $results;
     }