Skip to content
Snippets Groups Projects
Commit 35fb43d2 authored by Georg Ringer's avatar Georg Ringer Committed by waldhacker
Browse files

[BUGFIX] Restore contentObject condition in EXT:form

With #86196 the condition for `contentObject` has been
accidentally removed.

Resolves: #92471
Related: #86196
Releases: main, 11.5
Change-Id: I2c6ca4668141639650e3b4b1b58da2270f827f76
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66054


Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarElias Häußler <e.haeussler@familie-redlich.de>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarwaldhacker <hello@waldhacker.dev>
Reviewed-by: default avatarOliver Hader <oliver.hader@typo3.org>
Reviewed-by: default avatarElias Häußler <e.haeussler@familie-redlich.de>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarwaldhacker <hello@waldhacker.dev>
parent be7cb907
No related branches found
No related tags found
No related merge requests found
......@@ -1132,16 +1132,21 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
}
}
$contentObjectData = [];
if ($this->configurationManager->getContentObject() instanceof ContentObjectRenderer) {
$contentObjectData = $this->configurationManager->getContentObject()->data;
}
return GeneralUtility::makeInstance(
Resolver::class,
'form',
[
// some shortcuts
'formRuntime' => $this,
'formValues' => $formValues,
'stepIdentifier' => $page->getIdentifier(),
'stepType' => $page->getType(),
'finisherIdentifier' => $finisherIdentifier,
'contentObject' => $contentObjectData,
],
$GLOBALS['TYPO3_REQUEST'] ?? GeneralUtility::makeInstance(ServerRequest::class)
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment