diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php index 21dd8d92430bcab78ddc66bc37c8820ee348ddc3..678fb1f394f9c83d85a34b4f131642448800a48a 100644 --- a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php +++ b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php @@ -146,7 +146,6 @@ class FileLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac * * @param Folder $folder The folder path to expand * @param string $extensionList List of file extensions to show - * @return string HTML output */ public function expandFolder(Folder $folder, $extensionList = '') { diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php index 4c6358f6b3376c6a10237b7dd78ac336b37a41be..3bf396c8cf6f345daaece1d285a5b2c4fdb2ff59 100644 --- a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php +++ b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php @@ -220,34 +220,6 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac } } - /** - * Sets a DB mount and stores it in the currently defined backend user in her/his uc - */ - protected function setTemporaryDbMounts() - { - $backendUser = $this->getBackendUser(); - - // Clear temporary DB mounts - $tmpMount = GeneralUtility::_GET('setTempDBmount'); - if (isset($tmpMount)) { - $backendUser->setAndSaveSessionData('pageTree_temporaryMountPoint', (int)$tmpMount); - } - // Set temporary DB mounts - $alternativeWebmountPoint = (int)$backendUser->getSessionData('pageTree_temporaryMountPoint'); - if ($alternativeWebmountPoint) { - $alternativeWebmountPoint = GeneralUtility::intExplode(',', $alternativeWebmountPoint); - $backendUser->setWebmounts($alternativeWebmountPoint); - } else { - // Setting alternative browsing mounts (ONLY local to browse_links.php this script so they stay "read-only") - $alternativeWebmountPoints = trim($backendUser->getTSConfigVal('options.pageTree.altElementBrowserMountPoints')); - $appendAlternativeWebmountPoints = $backendUser->getTSConfigVal('options.pageTree.altElementBrowserMountPoints.append'); - if ($alternativeWebmountPoints) { - $alternativeWebmountPoints = GeneralUtility::intExplode(',', $alternativeWebmountPoints); - $this->getBackendUser()->setWebmounts($alternativeWebmountPoints, $appendAlternativeWebmountPoints); - } - } - } - /** * @return string[] Array of body-tag attributes */ diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php index 0fa92b0e08fe992c87171f98b70cfba8d3db8c56..ba98b475bc91df913a4c5d58926f02b0dc4fa2c5 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php @@ -575,7 +575,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList // get translated labels for search levels from pagets foreach ($searchLevelsFromTSconfig as $keySearchLevel => $labelConfigured) { - $label = $lang->sL('LLL:' . $labelConfigured, false); + $label = $lang->sL('LLL:' . $labelConfigured); if ($label === '') { $label = $labelConfigured; } diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php index 4e2590b41e98d7dbd01c474a0f605fd5921c473f..c4a8a641ce6acc4928b5846f6f8eeb1a7bd24a22 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php @@ -646,12 +646,12 @@ class DatabaseRecordList extends AbstractDatabaseRecordList } if ($this->firstElementNumber > 2 && $this->iLimit > 0) { // Get the two previous rows for sorting if displaying page > 1 - $this->firstElementNumber = $this->firstElementNumber - 2; - $this->iLimit = $this->iLimit + 2; + $this->firstElementNumber -= 2; + $this->iLimit += 2; // (API function from TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList) $queryBuilder = $this->getQueryBuilder($table, $id, $additionalConstraints); - $this->firstElementNumber = $this->firstElementNumber + 2; - $this->iLimit = $this->iLimit - 2; + $this->firstElementNumber += 2; + $this->iLimit -= 2; } else { // (API function from TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList) $queryBuilder = $this->getQueryBuilder($table, $id, $additionalConstraints);