diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php index e0acbc7630..bf4aef70e2 100644 --- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php +++ b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php @@ -197,14 +197,20 @@ public function getAllowedImageStyles() { protected function getImageInfo($file_uuid) { /** @var \Drupal\file\FileInterface $file */ $file = $this->entityRepository->loadEntityByUuid('file', $file_uuid); - if (!$file || !($image = $this->imageFactory->get($file->getFileUri())) || !$image->isValid()) { - throw new \RuntimeException("Invalid image with UUID $file_uuid."); + + // Determine the URI, width and height of the source image. + $image_uri = $image_width = $image_height = NULL; + $image = $this->imageFactory->get($file->getFileUri()); + if ($image->isValid()) { + $image_uri = $file->getFileUri(); + $image_width = $image->getWidth(); + $image_height = $image->getHeight(); } return [ - '#uri' => $file->getFileUri(), - '#width' => $image->getWidth(), - '#height' => $image->getHeight(), + '#uri' => $image_uri, + '#width' => $image_width, + '#height' => $image_height, ]; }