[BUGFIX] Read ContentObjectRenderer from currentContentObject attribute if set

NamelessCoder · NamelessCoder · commit 2c6d40d25e39 · 2025-01-28T15:15:50.000+01:00
diff --git a/Classes/Utility/ContentObjectFetcher.php b/Classes/Utility/ContentObjectFetcher.php
@@ -39,6 +39,9 @@ public static function resolve(?ConfigurationManagerInterface $configurationMana
 
     protected static function resolveFromRequest(ServerRequestInterface $request): ?ContentObjectRenderer
     {
+        if (($cObject = $request->getAttribute('currentContentObject')) instanceof ContentObjectRenderer) {
+            return $cObject;
+        }
         /** @var TypoScriptFrontendController $controller */
         $controller = $request->getAttribute('frontend.controller');
         return $controller instanceof TypoScriptFrontendController ? $controller->cObj : null;

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ public static function resolve(?ConfigurationManagerInterface $configurationMana`
`39`	`39`
`40`	`40`	`protected static function resolveFromRequest(ServerRequestInterface $request): ?ContentObjectRenderer`
`41`	`41`	`{`
	`42`	`+ if (($cObject = $request->getAttribute('currentContentObject')) instanceof ContentObjectRenderer) {`
	`43`	`+ return $cObject;`
	`44`	`+ }`
`42`	`45`	`/** @var TypoScriptFrontendController $controller */`
`43`	`46`	`$controller = $request->getAttribute('frontend.controller');`
`44`	`47`	`return $controller instanceof TypoScriptFrontendController ? $controller->cObj : null;`