From 5d2c786139bf61a41a51d8dee83dcf3a3dedee86 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 17 Nov 2016 12:54:42 +0100
Subject: [PATCH] [TASK] Remove all $GLOBALS['rootline'] usages
The getRootline() method of ExtendedTemplateService is broken
because of an incomplete replacement of the web_ts changes.
See https://review.typo3.org/#/c/50626/
The fix replaces the rootline variable in the last occurence
by the correct replacement.
Related: #78675
Resolves: #76545
Releases: master
Change-Id: Ib554679fd86230e183801e9b234a8138d4518cd3
Reviewed-on: https://review.typo3.org/50695
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../core/Classes/TypoScript/ExtendedTemplateService.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index e510399ccc7a..36a97450274c 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -1632,11 +1632,13 @@ class ExtendedTemplateService extends TemplateService
}
/**
+ * Is set by runThroughTemplates(), previously set via TemplateAnalyzerModuleFunctionController from the outside
+ *
* @return array
*/
protected function getRootLine()
{
- return isset($GLOBALS['rootLine']) ? $GLOBALS['rootLine'] : [];
+ return is_array($this->absoluteRootLine) ? $this->absoluteRootLine : [];
}
/**
--
GitLab