From 63293d613d89d2356c6677940e2f6f9c1b340673 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <bfr@qbus.de>
Date: Wed, 7 Mar 2018 13:06:28 +0100
Subject: [PATCH] [BUGFIX] Revert "[BUGFIX] Fix recursive FLUIDTEMPLATE cObj's
that use layoutRootPaths"
This reverts commit 5c048a4c8017e4d50ab5f2343970a0fd33e4aaed
as introduced in https://review.typo3.org/54416
That workaround for a fluid bug had side effects when DataProviders
expected a ConfigurationManager instance to be available. That is
nothing officially supported but broke some (bad behaving) DataProviders.
As the fluid bug has been fixed in https://github.com/TYPO3/Fluid/pull/342
(contained in release 2.5.2) we can revert the workaround now.
The functional test that was introduced next to the bugfix is not reverted,
as do want to keep that obviously.
Resolves: #84071
Releases: master, 8.7
Change-Id: Ie6f5541f0f217fee7e85df954bb964a32fd27367
Reviewed-on: https://review.typo3.org/56045
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../ContentObject/FluidTemplateContentObject.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
index 92e7a1976e34..862ac1a99d2f 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
@@ -84,14 +84,12 @@ class FluidTemplateContentObject extends AbstractContentObject
*/
public function render($conf = [])
{
+ $parentView = $this->view;
+ $this->initializeStandaloneViewInstance();
+
if (!is_array($conf)) {
$conf = [];
}
- $variables = $this->getContentObjectVariables($conf);
- $variables = $this->contentDataProcessor->process($this->cObj, $conf, $variables);
-
- $parentView = $this->view;
- $this->initializeStandaloneViewInstance();
$this->setFormat($conf);
$this->setTemplate($conf);
@@ -99,6 +97,8 @@ class FluidTemplateContentObject extends AbstractContentObject
$this->setPartialRootPath($conf);
$this->setExtbaseVariables($conf);
$this->assignSettings($conf);
+ $variables = $this->getContentObjectVariables($conf);
+ $variables = $this->contentDataProcessor->process($this->cObj, $conf, $variables);
$this->view->assignMultiple($variables);
--
GitLab