From c4ffef9116a6aeaa955a0daf4b425602719e15af Mon Sep 17 00:00:00 2001 From: 3m5/frohberg Date: Wed, 13 Mar 2024 16:27:03 +0100 Subject: [PATCH] Fix reloading iframe content Remove origin from Iframe url TASK: Fix types BUGFIX: Create absolute URI in NodeInfoHelper.php Revert "Remove origin from Iframe url" This reverts commit d0c2f489a87797fae43fa31f8592020bc10f19b9. Revert "Fix reloading iframe content" This reverts commit 6af774e47f972442c184829ffb2e6925af1637f4. --- Classes/Controller/BackendServiceController.php | 2 +- Classes/Fusion/Helper/NodeInfoHelper.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php index 816eab2273..adc388d582 100644 --- a/Classes/Controller/BackendServiceController.php +++ b/Classes/Controller/BackendServiceController.php @@ -585,7 +585,7 @@ public function flowQueryAction(array $chain): string } /** @see GetOperation */ - assert(is_callable([$flowQuery, 'get'])); + assert(is_object($flowQuery) && is_callable([$flowQuery, 'get'])); $nodeInfoHelper = new NodeInfoHelper(); $type = $finisher['type'] ?? null; diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php index daaf228364..3e5278c1bc 100644 --- a/Classes/Fusion/Helper/NodeInfoHelper.php +++ b/Classes/Fusion/Helper/NodeInfoHelper.php @@ -350,7 +350,10 @@ public function uri(Node|NodeAddress $nodeAddress, ActionRequest $actionRequest) $nodeAddressFactory = NodeAddressFactory::create($contentRepository); $nodeAddress = $nodeAddressFactory->createFromNode($nodeAddress); } - return (string)NodeUriBuilder::fromRequest($actionRequest)->uriFor($nodeAddress); + $uriBuilder = new UriBuilder(); + $uriBuilder->setRequest($actionRequest); + $uriBuilder->setCreateAbsoluteUri(true); + return (string)NodeUriBuilder::fromUriBuilder($uriBuilder)->uriFor($nodeAddress); } public function previewUri(Node $node, ActionRequest $actionRequest): string