BUGFIX: Only discard nodes in same workspace

If a node is moved in a sub workspace it’s possible that childnodes from the base workspace are returned and discarded. If the parent workspace is live, this will lead to an exception in the workspace module, if it’s another shared workspace it might even discard nodes from it. Resolves: #4577
neos · Oct 6, 2023 · 595fcba · 595fcba
1 parent f328dd8
commit 595fcba
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Neos.ContentRepository/Classes/Domain/Service/PublishingService.php b/Neos.ContentRepository/Classes/Domain/Service/PublishingService.php
@@ -182,8 +182,11 @@ protected function doDiscardNode(NodeInterface $node, array &$alreadyDiscardedNo
         if ($possibleShadowNodeData instanceof NodeData) {
             if ($possibleShadowNodeData->getMovedTo() !== null) {
                 $parentBasePath = $node->getPath();
-                $affectedChildNodeDataInSameWorkspace = $this->nodeDataRepository->findByParentAndNodeType($parentBasePath, null, $node->getWorkspace(), null, false, true);
-                foreach ($affectedChildNodeDataInSameWorkspace as $affectedChildNodeData) {
+                $affectedChildNodeDataInWorkspaceChain = $this->nodeDataRepository->findByParentAndNodeType($parentBasePath, null, $node->getWorkspace(), null, false, true);
+                foreach ($affectedChildNodeDataInWorkspaceChain as $affectedChildNodeData) {
+                    if (!$affectedChildNodeData->matchesWorkspaceAndDimensions($node->getWorkspace(), $node->getDimensions())) {
+                        continue;
+                    }
                     /** @var NodeData $affectedChildNodeData */
                     $affectedChildNode = $this->nodeFactory->createFromNodeData($affectedChildNodeData, $node->getContext());
                     $this->doDiscardNode($affectedChildNode, $alreadyDiscardedNodeIdentifiers);