diff --git a/core/modules/image/src/ImageServiceProvider.php b/core/modules/image/src/ImageServiceProvider.php index a5dd321..3c71e02 100644 --- a/core/modules/image/src/ImageServiceProvider.php +++ b/core/modules/image/src/ImageServiceProvider.php @@ -23,7 +23,10 @@ public function register(ContainerBuilder $container) { $service_definition = new Definition(ImageFieldItemNormalizer::class, [ new Reference('entity_type.manager'), ]); - $service_definition->addTag('normalizer', ['priority' => 40]); + // Priority should be higher than + // serializer.normalizer.entity_reference_field_item but lower than + // serializer.normalizer.entity_reference_item.hal + $service_definition->addTag('normalizer', ['priority' => 7]); $container->setDefinition('image.normalizer.image_item', $service_definition); } } diff --git a/core/modules/image/src/Normalizer/ImageFieldItemNormalizer.php b/core/modules/image/src/Normalizer/ImageFieldItemNormalizer.php index 69ef136..bad86c5 100644 --- a/core/modules/image/src/Normalizer/ImageFieldItemNormalizer.php +++ b/core/modules/image/src/Normalizer/ImageFieldItemNormalizer.php @@ -49,12 +49,10 @@ public function normalize($object, $format = NULL, array $context = array()) { $uri = $image->getFileUri(); /** @var \Drupal\image\Entity\ImageStyle[] $styles */ $styles = $this->entityTypeManager->getStorage('image_style')->loadMultiple(); - if ($styles) { - $data['image_styles'] = []; - foreach ($styles as $id => $style) { - $data['image_styles'][$id] = file_url_transform_relative($style->buildUrl($uri)); - $this->bubble($style); - } + $data['image_styles'] = []; + foreach ($styles as $id => $style) { + $data['image_styles'][$id] = $style->buildUrl($uri); + $this->bubble($style); } return $data; }