From ca34b59c644094642e6f38189af0ebef5b2f1381 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Wed, 12 Oct 2022 18:14:58 +0200
Subject: [PATCH] Refs #12588. T3 Version check seperated: BE Login=v9, SLUG &
UrlBaseLang=v10
---
extension/Classes/Core/Store/T3Info.php | 4 ++--
extension/Classes/Core/Typo3/T3Handler.php | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/extension/Classes/Core/Store/T3Info.php b/extension/Classes/Core/Store/T3Info.php
index 67897aeda..0f9d1b69b 100644
--- a/extension/Classes/Core/Store/T3Info.php
+++ b/extension/Classes/Core/Store/T3Info.php
@@ -100,7 +100,7 @@ class T3Info {
}
$lid = self::getLanguageId();
- if ($lid !== '' && is_numeric($lid) && T3Handler::typo3VersionGreaterEqual9()) {
+ if ($lid !== '' && is_numeric($lid) && T3Handler::typo3VersionGreaterEqual('9.0.0')) {
$lid = intval($lid);
try {
// In an API call Typo3 might have been loaded manually by QFQ at some earlier point. But the following line does not work in that case.
@@ -130,7 +130,7 @@ class T3Info {
*/
public static function beUserLoggedIn() {
- if (T3Handler::isTypo3Loaded() && T3Handler::typo3VersionGreaterEqual9()) {
+ if (T3Handler::isTypo3Loaded() && T3Handler::typo3VersionGreaterEqual('9.0.0')) {
// Typo3 version >=9
$context = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Context\Context::class);
return $context->getPropertyFromAspect('backend.user', 'isLoggedIn');
diff --git a/extension/Classes/Core/Typo3/T3Handler.php b/extension/Classes/Core/Typo3/T3Handler.php
index 1759fd524..5bc947973 100644
--- a/extension/Classes/Core/Typo3/T3Handler.php
+++ b/extension/Classes/Core/Typo3/T3Handler.php
@@ -230,7 +230,7 @@ class T3Handler {
*
* @return bool
*/
- public static function typo3VersionGreaterEqual9() {
+ public static function typo3VersionGreaterEqual($version) {
if (defined('PHPUNIT_QFQ')) {
// assume Typo3 version grater than 8 in unittests
return true;
@@ -238,7 +238,7 @@ class T3Handler {
static $cache = null;
if (is_null($cache)) {
// use pageSlug notation after 10.0
- $cache = version_compare(self::getTypo3Version(), '10.0.0') >= 0;
+ $cache = version_compare(self::getTypo3Version(), $version) >= 0;
}
return $cache;
}
@@ -271,7 +271,7 @@ class T3Handler {
public static function useSlugsInsteadOfPageAlias() {
static $cache = null;
if (is_null($cache)) {
- $cache = self::typo3VersionGreaterEqual9();
+ $cache = self::typo3VersionGreaterEqual('10.0.0');
}
return $cache;
}
--
GitLab