diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php index ba3e6955fa39c1a74ac77777e0d1a4f028672469..4bf0ffb94ac61222916f1fedcd0fef5a449bb47b 100644 --- a/Classes/Controller/BackendController.php +++ b/Classes/Controller/BackendController.php @@ -27,8 +27,8 @@ namespace SGalinski\SgNews\Controller; ***************************************************************/ use In2code\Powermail\Utility\LocalizationUtility; -use SGalinski\SgNews\Service\BackendNewsUtility; use SGalinski\SgNews\Service\LicensingService; +use SGalinski\SgNews\Utility\BackendNewsUtility; use TYPO3\CMS\Backend\Clipboard\Clipboard; use TYPO3\CMS\Backend\Template\Components\ButtonBar; use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent; diff --git a/Classes/Hooks/EditDocumentController.php b/Classes/Hooks/EditDocumentController.php index 879bdeefd40130bee329774d5436d01734d9c3bc..20dde30e5c4adfd8e1422439933843e525923bfe 100644 --- a/Classes/Hooks/EditDocumentController.php +++ b/Classes/Hooks/EditDocumentController.php @@ -25,7 +25,7 @@ namespace SGalinski\SgNews\Hooks; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use SGalinski\SgNews\Service\BackendNewsUtility; +use SGalinski\SgNews\Utility\BackendNewsUtility; use TYPO3\CMS\Backend\Utility\BackendUtility; /** diff --git a/Classes/Service/BackendNewsUtility.php b/Classes/Utility/BackendNewsUtility.php similarity index 97% rename from Classes/Service/BackendNewsUtility.php rename to Classes/Utility/BackendNewsUtility.php index a2eade64dc67d3b5639c2d0ae6d435da030dcd6c..b4e71980a37c9567455489c4aa85489522f3de51 100644 --- a/Classes/Service/BackendNewsUtility.php +++ b/Classes/Utility/BackendNewsUtility.php @@ -1,6 +1,6 @@ <?php -namespace SGalinski\SgNews\Service; +namespace SGalinski\SgNews\Utility; /*************************************************************** * Copyright notice @@ -32,6 +32,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication; use TYPO3\CMS\Core\Database\DatabaseConnection; use TYPO3\CMS\Core\Database\QueryGenerator; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Core\Utility\VersionNumberUtility; use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Persistence\QueryInterface; use TYPO3\CMS\Extbase\Utility\LocalizationUtility; @@ -390,8 +391,12 @@ class BackendNewsUtility { ]; /** @var DatabaseConnection $databaseConnection */ $databaseConnection = $GLOBALS['TYPO3_DB']; + $orderBy = ''; + if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 8000000) { + $orderBy = 'sorting'; + } $languageRows = $databaseConnection->exec_SELECTgetRows( - 'uid, title, flag', 'sys_language', 'hidden = 0', '', 'sorting' + 'uid, title, flag', 'sys_language', 'hidden = 0', '', $orderBy ); if ($languageRows) { /** @var BackendUserAuthentication $backendUser */ diff --git a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php index fb6cda9d73f2f5d26870bccadc0c5ee6ade2ff43..7ef98501e7387700e64277e24e1f1eb6a2fbc259 100644 --- a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php +++ b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php @@ -26,7 +26,7 @@ namespace SGalinski\SgNews\ViewHelpers\Backend; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use SGalinski\SgNews\Service\BackendNewsUtility; +use SGalinski\SgNews\Utility\BackendNewsUtility; use SGalinski\SgNews\ViewHelpers\AbstractViewHelper; use TYPO3\CMS\Backend\Utility\BackendUtility; diff --git a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php index bf9f22d3de8ab6b0cbd1f77dbd7d50727addaffb..d6708130743e0b8c499dd52164d645d937b90490 100644 --- a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php +++ b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php @@ -26,8 +26,8 @@ namespace SGalinski\SgNews\ViewHelpers\Backend; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use SGalinski\SgNews\Service\BackendNewsUtility; use SGalinski\SgNews\Service\LicensingService; +use SGalinski\SgNews\Utility\BackendNewsUtility; use SGalinski\SgNews\ViewHelpers\AbstractViewHelper; use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Core\Imaging\Icon;