Merge remote-tracking branch 'origin/7.3' into 8.0

neos · Oct 21, 2023 · de4dd1f · de4dd1f
2 parents 25ef828 + 03c6b84
commit de4dd1f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 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);

diff --git a/Neos.Media/Classes/Domain/Model/Thumbnail.php b/Neos.Media/Classes/Domain/Model/Thumbnail.php
@@ -224,4 +224,9 @@ public function refresh()
     {
         $this->generatorStrategy->refresh($this);
     }
+
+    public function getConfigurationHash(): string
+    {
+        return $this->configurationHash;
+    }
 }
diff --git a/Neos.Media/Classes/Domain/Service/ThumbnailGenerator.php b/Neos.Media/Classes/Domain/Service/ThumbnailGenerator.php
@@ -48,8 +48,10 @@ public function createThumbnails(AssetInterface $image)
     {
         if ($this->autoCreateThumbnailPresets) {
             foreach ($this->thumbnailService->getPresets() as $preset => $presetConfiguration) {
-                $thumbnailConfiguration = $this->thumbnailService->getThumbnailConfigurationForPreset($preset, $this->asyncThumbnails);
-                $this->thumbnailService->getThumbnail($image, $thumbnailConfiguration);
+                if ($presetConfiguration) {
+                    $thumbnailConfiguration = $this->thumbnailService->getThumbnailConfigurationForPreset($preset, $this->asyncThumbnails);
+                    $this->thumbnailService->getThumbnail($image, $thumbnailConfiguration);
+                }
             }
         }
     }

diff --git a/Neos.Media/Classes/Domain/Service/ThumbnailService.php b/Neos.Media/Classes/Domain/Service/ThumbnailService.php
@@ -132,8 +132,16 @@ public function getThumbnail(AssetInterface $asset, ThumbnailConfiguration $conf
         if (isset($this->thumbnailCache[$assetIdentifier][$configurationHash])) {
             $thumbnail = $this->thumbnailCache[$assetIdentifier][$configurationHash];
         } else {
-            $thumbnail = $this->thumbnailRepository->findOneByAssetAndThumbnailConfiguration($asset, $configuration);
-            $this->thumbnailCache[$assetIdentifier][$configurationHash] = $thumbnail;
+            $thumbnail = null;
+            // Load all thumbnails for the asset and cache them to prevent further db requests for the same asset
+            $thumbnailsForAsset = $this->thumbnailRepository->findByOriginalAsset($asset);
+            /** @var Thumbnail $thumbnailVariant */
+            foreach ($thumbnailsForAsset as $thumbnailVariant) {
+                $this->thumbnailCache[$assetIdentifier][$thumbnailVariant->getConfigurationHash()] = $thumbnailVariant;
+                if ($thumbnailVariant->getConfigurationHash() === $configurationHash) {
+                    $thumbnail = $thumbnailVariant;
+                }
+            }
         }
         $async = $configuration->isAsync();
         if ($thumbnail === null) {