Merge remote-tracking branch 'origin/5.3'

dlubitz · dlubitz · commit 5f26c3aeb98c · 2025-04-04T11:10:48.000+02:00
diff --git a/Resources/Private/Fusion/Helper/SearchResultrenderer/SearchresultRenderer.fusion b/Resources/Private/Fusion/Helper/SearchResultrenderer/SearchresultRenderer.fusion
@@ -4,5 +4,5 @@ prototype(Flowpack.SearchPlugin:SearchResultRenderer) < prototype(Neos.Fusion:Lo
     itemRenderer = Flowpack.SearchPlugin:SingleResult
     itemName = 'node'
     // we also make the full ElasticSearch hit available to nested rendering, if possible
-    itemRenderer.@context.searchHit = ${searchResults.searchHitForNode(node)}
+    itemRenderer.@context.searchHit = ${Type.instance(searchResults , '\Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult') ? searchResults.searchHitForNode(node) : null}
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ prototype(Flowpack.SearchPlugin:SearchResultRenderer) < prototype(Neos.Fusion:Lo`
`4`	`4`	`itemRenderer = Flowpack.SearchPlugin:SingleResult`
`5`	`5`	`itemName = 'node'`
`6`	`6`	`// we also make the full ElasticSearch hit available to nested rendering, if possible`
`7`		`- itemRenderer.@context.searchHit = ${searchResults.searchHitForNode(node)}`
	`7`	`+ itemRenderer.@context.searchHit = ${Type.instance(searchResults , '\Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult') ? searchResults.searchHitForNode(node) : null}`
`8`	`8`	`}`