From d869f389b5ebfc6fa752e6d70abcec2dcd1355c8 Mon Sep 17 00:00:00 2001 From: Stuart McFarlane Date: Mon, 17 Dec 2018 15:42:36 +0100 Subject: [PATCH 1/2] [FIX] GeneralUtility no longer mis-caches __CURRENT__ rootline Fixed #533 --- Classes/Utility/GeneralUtility.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Classes/Utility/GeneralUtility.php b/Classes/Utility/GeneralUtility.php index 17a9ae6..fe601f4 100644 --- a/Classes/Utility/GeneralUtility.php +++ b/Classes/Utility/GeneralUtility.php @@ -121,17 +121,17 @@ public static function getRootLine($uid = null) ################# # Current rootline ################# - if (empty(self::$rootlineCache['__CURRENT__'])) { - // Current rootline - $rootline = $GLOBALS['TSFE']->tmpl->rootLine; + // Current rootline + $rootline = $GLOBALS['TSFE']->tmpl->rootLine; - // Filter rootline by siteroot - $rootline = self::filterRootlineBySiteroot((array)$rootline); + // Filter rootline by siteroot + $rootline = self::filterRootlineBySiteroot((array)$rootline); - self::$rootlineCache['__CURRENT__'] = $rootline; - } + $currentUid = $rootline[0]['uid']; + + self::$rootlineCache[$currentUid] = $rootline; - $ret = self::$rootlineCache['__CURRENT__']; + $ret = self::$rootlineCache[$currentUid]; } else { ################# # Other rootline From 0c491d162e403316e4a63b98c3a6857d697ba387 Mon Sep 17 00:00:00 2001 From: Stuart McFarlane Date: Mon, 17 Dec 2018 16:46:40 +0100 Subject: [PATCH 2/2] fixed up composer stuff --- composer.json | 4 ++-- ext_emconf.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 32b9a7d..1d58a44 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "webdevops/metaseo", + "name": "stuartmcfarlane/metaseo", "type": "typo3-cms-extension", "description": "SEO extension for TYPO3", "homepage": "https://github.com/webdevops/TYPO3-metaseo", @@ -8,7 +8,7 @@ }, "license": ["GPL-3.0+"], "keywords": ["TYPO3 CMS"], - "version": "2.1.0", + "version": "2.1.1", "autoload": { "psr-4": { "Metaseo\\Metaseo\\": "Classes/" diff --git a/ext_emconf.php b/ext_emconf.php index 23aaeec..3706cf3 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -5,7 +5,7 @@ 'description' => 'Search Engine Optimization (SEO), Indexed Google-Sitemap (TXT- and XML-Sitemap) for all Extensions (pibase, extbase), Metatags, Canonical-URL, Pagetitle manipulations, Crawler verification, Piwik and Google Analytics support and some more... multi-language- and multi-tree-support', 'category' => 'misc', 'shy' => 0, - 'version' => '2.1.0', + 'version' => '2.1.1', 'dependencies' => '', 'conflicts' => '', 'priority' => '',