From 52b387b72fcb2c462dfab1dde7a748598fd8c61d Mon Sep 17 00:00:00 2001 From: Christian Kuhn <lolli@schwarzbu.ch> Date: Tue, 23 Aug 2016 14:08:17 +0200 Subject: [PATCH] [TASK] Doctrine: Migrate AbstractDatabaseRecordList last pieces Change-Id: I35e9463c96474fb1eb0459cb6d915785df7d2108 Resolves: #77605 Releases: master Reviewed-on: https://review.typo3.org/49553 Tested-by: Bamboo TYPO3com <info@typo3.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com> Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: Benni Mack <benni@typo3.org> --- .../Classes/RecordList/AbstractDatabaseRecordList.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php index 47f786d68776..ff7eabd623b3 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php @@ -702,9 +702,18 @@ class AbstractDatabaseRecordList extends AbstractRecordList 'FROM' => $table, 'WHERE' => $this->getPageIdConstraint($table) . ' ' . $pC . BackendUtility::deleteClause($table) . BackendUtility::versioningPlaceholderClause($table) . ' ' . $addWhere . ' ' . $search, 'GROUPBY' => '', - 'ORDERBY' => $this->getDatabaseConnection()->stripOrderBy($orderBy), 'LIMIT' => $limit ); + $tempOrderBy = []; + foreach (QueryHelper::parseOrderBy($orderBy) as $orderPair) { + list($fieldName, $order) = $orderPair; + if ($order !== null) { + $tempOrderBy[] = implode(' ', $orderPair); + } else { + $tempOrderBy[] = $fieldName; + } + } + $queryParts['ORDERBY'] = implode(',', $tempOrderBy); // Filter out records that are translated, if TSconfig mod.web_list.hideTranslations is set if ((in_array($table, GeneralUtility::trimExplode(',', $this->hideTranslations)) || $this->hideTranslations === '*') && !empty($GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']) && $table !== 'pages_language_overlay') { $queryParts['WHERE'] .= ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=0 '; -- GitLab