Skip to content

Commit c4e1671

Browse files
committed
Merge branch '8.4' into 9.0
# Conflicts: # Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php # Neos.Neos/Documentation/References/CommandReference.rst # Neos.Neos/Documentation/References/EelHelpersReference.rst # Neos.Neos/Documentation/References/FlowQueryOperationReference.rst # Neos.Neos/Documentation/References/Signals/ContentRepository.rst # Neos.Neos/Documentation/References/Signals/Flow.rst # Neos.Neos/Documentation/References/Signals/Media.rst # Neos.Neos/Documentation/References/Signals/Neos.rst # Neos.Neos/Documentation/References/Validators/Flow.rst # Neos.Neos/Documentation/References/Validators/Media.rst # Neos.Neos/Documentation/References/Validators/Party.rst # Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst # Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst # Neos.Neos/Documentation/References/ViewHelpers/Form.rst # Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst # Neos.Neos/Documentation/References/ViewHelpers/Media.rst # Neos.Neos/Documentation/References/ViewHelpers/Neos.rst # Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst # Neos.Neos/Resources/Private/Translations/fi/Main.xlf # Neos.Neos/Resources/Private/Translations/fi/Modules.xlf # Neos.Neos/Resources/Private/Translations/nl/Modules.xlf
2 parents db39252 + 82dfd32 commit c4e1671

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Neos.Media/Classes/Domain/Service/ThumbnailService.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,15 @@ public function getUriForThumbnail(ImageInterface $thumbnail): string
255255
{
256256
$resource = $thumbnail->getResource();
257257
if ($resource) {
258-
return $this->resourceManager->getPublicPersistentResourceUri($resource);
258+
$uri = $this->resourceManager->getPublicPersistentResourceUri($resource);
259+
if ($uri === false) {
260+
throw new ThumbnailServiceException(sprintf(
261+
'Could not generate URI for resource "%s".',
262+
$this->persistenceManager->getIdentifierByObject($resource)
263+
), 1737558490);
264+
}
265+
266+
return $uri;
259267
}
260268

261269
$staticResource = $thumbnail->getStaticResource();

0 commit comments

Comments
 (0)