Merge pull request #4578 from neos/bugfix/only-discard-nodes-in-same-…

…workspace BUGFIX: Only discard nodes in same workspace
neos · Oct 20, 2023 · dfd4d89 · dfd4d89
2 parents db63fe0 + 595fcba
commit dfd4d89
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);