From 49efa6b891bc6c3e288b31f71fbfb22fba954dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anke=20H=C3=A4slich?= Date: Thu, 19 Oct 2023 10:57:35 +0200 Subject: [PATCH] BUGFIX: Set correct siteNode in WorkspaceController This fixes a merge error introduced with https://github.com/neos/neos-development-collection/pull/4588/commits/fa381195c11178825bf7f5fe746e5c6ef698fd63 We check `$ancestor` to be of nodeType `Neos.Neos:Site` so this is the correct value for `$siteNode`. Relates: #4588 --- .../Controller/Module/Management/WorkspacesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php index f688b009f91..498ac5125b5 100644 --- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php +++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php @@ -792,7 +792,7 @@ protected function computeSiteChanges(Workspace $selectedWorkspace, ContentRepos } } if ($this->getNodeType($ancestor)->isOfType(NodeTypeNameFactory::NAME_SITE)) { - $siteNode = $documentNode; + $siteNode = $ancestor; } }