BUGFIX_typo3_10_4_17_extbase_forge_typo3_issue_94140.patch - TYPO3 Core - TYPO3 Forge

Bug #94140 » BUGFIX_typo3_10_4_17_extbase_forge_typo3_issue_94140.patch

Patch for 10.4.17 - Heiko Fischer, 2021-07-08 10:46

             // record to find out all possible fields in this database table
             $fieldsOfMainTable = $pageRepository->getRawRecord($tableName, $rows[0]['uid']);
             $overlaidRows = [];
             foreach ($rows as $row) {
                 $mainRow = array_intersect_key($row, $fieldsOfMainTable);
                 $joinRow = array_diff_key($row, $mainRow);
                 $mainRow = $this->overlayLanguageAndWorkspaceForSingleRecord($tableName, $mainRow, $pageRepository, $query);
                 if ($mainRow !== null && is_array($mainRow)) {
                     $overlaidRows[] = array_replace($joinRow, $mainRow);
             if ($fieldsOfMainTable !== 0) {
                 foreach ($rows as $row) {
                     $mainRow = array_intersect_key($row, $fieldsOfMainTable);
                     $joinRow = array_diff_key($row, $mainRow);
                     $mainRow = $this->overlayLanguageAndWorkspaceForSingleRecord($tableName, $mainRow, $pageRepository, $query);
                     if ($mainRow !== null && is_array($mainRow)) {
                         $overlaidRows[] = array_replace($joinRow, $mainRow);
+                    }
+                }
+            }
             return $overlaidRows;
+        }

(2-2/2)