[BUGFIX] Make QueryGenerator handle multiple label_alt columns

The label_alt field in TCA is a comma separated list of database columns, so it needs to be exploded before being passed into a database query. Resolves: #83268 Releases: master, 10.4 Change-Id: I5daf07acd3ee2d409d970ac896408bec2e0abe33 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70057 Reviewed-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Guido Schmechel <guido.schmechel@brandung.de> Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com> Tested-by: core-ci <typo3@b13.com> Tested-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
TYPO3 · Aug 16, 2021 · ab1d989 · ab1d989
1 parent 9108f31
commit ab1d989
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -916,7 +916,7 @@ public function makeOptionList($fieldName, $conf, $table)
                         }
                         $selectFields = ['uid', $labelField];
                         if ($altLabelField) {
-                            $selectFields[] = $altLabelField;
+                            $selectFields = array_merge($selectFields, GeneralUtility::trimExplode(',', $altLabelField, true));
                         }
                         $queryBuilder->select(...$selectFields)
                             ->from($from_table)

diff --git a/typo3/sysext/lowlevel/Classes/Database/QueryGenerator.php b/typo3/sysext/lowlevel/Classes/Database/QueryGenerator.php
@@ -1258,7 +1258,7 @@ protected function makeValueList($fieldName, $fieldValue, $conf, $table, $splitS
                         $queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
                         $selectFields = ['uid', $labelField];
                         if ($altLabelField) {
-                            $selectFields[] = $altLabelField;
+                            $selectFields = array_merge($selectFields, GeneralUtility::trimExplode(',', $altLabelField, true));
                         }
                         $queryBuilder->select(...$selectFields)
                             ->from($from_table)
@@ -2048,7 +2048,7 @@ protected function makeOptionList($fieldName, $conf, $table)
                         }
                         $selectFields = ['uid', $labelField];
                         if ($altLabelField) {
-                            $selectFields[] = $altLabelField;
+                            $selectFields = array_merge($selectFields, GeneralUtility::trimExplode(',', $altLabelField, true));
                         }
                         $queryBuilder->select(...$selectFields)
                             ->from($from_table)