diff --git a/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php index 4b8ee74..e908e5be 100644 --- a/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php +++ b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php @@ -29,15 +29,17 @@ protected function decorateWithImageStyles(ImageItem $item, array &$normalizatio $styles = ImageStyle::loadMultiple(); $normalization['image_styles'] = []; foreach ($styles as $id => $style) { - $dimensions = ['width' => $item->width, 'height' => $item->height]; - $style->transformDimensions($dimensions, $uri); - $normalization['image_styles'][$id] = [ - 'url' => file_url_transform_relative($style->buildUrl($uri)), - 'height' => empty($dimensions['height']) ? NULL : $dimensions['height'], - 'width' => empty($dimensions['width']) ? NULL : $dimensions['width'], - ]; - if (!empty($context['cacheability'])) { - $context['cacheability']->addCacheableDependency($style); + if ($style->supportsUri($uri)) { + $dimensions = ['width' => $item->width, 'height' => $item->height]; + $style->transformDimensions($dimensions, $uri); + $normalization['image_styles'][$id] = [ + 'url' => file_url_transform_relative($style->buildUrl($uri)), + 'height' => empty($dimensions['height']) ? NULL : $dimensions['height'], + 'width' => empty($dimensions['width']) ? NULL : $dimensions['width'], + ]; + if (!empty($context['cacheability'])) { + $context['cacheability']->addCacheableDependency($style); + } } } }