Skip to content
Snippets Groups Projects
Commit 63293d61 authored by Benjamin Franzke's avatar Benjamin Franzke Committed by Christian Kuhn
Browse files

[BUGFIX] Revert "[BUGFIX] Fix recursive FLUIDTEMPLATE cObj's that use layoutRootPaths"

This reverts commit 5c048a4c
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: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
parent e9723498
Branches
Tags
No related merge requests found
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment