diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php index 674964d..8c8ff78 100644 --- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php @@ -43,22 +43,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) { * {@inheritdoc} */ public function settingsSummary() { - $summary = []; - - $image_styles = image_style_options(FALSE); - // Unset possible 'No defined styles' option. - unset($image_styles['']); - // Styles could be lost because of enabled/disabled modules that defines - // their styles in code. - $image_style_setting = $this->getSetting('image_style'); - if (isset($image_styles[$image_style_setting])) { - $summary[] = $this->t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]); - } - else { - $summary[] = $this->t('Original image'); - } - - return $summary; + $summary = parent::settingsSummary(); + return [$summary[0]]; } /** @@ -79,6 +65,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { foreach ($images as $delta => $image) { $image_uri = $image->getFileUri(); $url = $image_style ? $image_style->buildUrl($image_uri) : file_create_url($image_uri); + $url = file_url_transform_relative($url); // Add cacheability metadata from the image and image style. $cacheability = CacheableMetadata::createFromObject($image); diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php index 6ee9f31..8fd2aa7 100644 --- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php @@ -204,11 +204,7 @@ function _testImageFieldFormatters($scheme) { // Test the image URL formatter without an image style. $display_options = [ 'type' => 'image_url', - 'settings' => [ - 'image_style' => '', - 'url_link' => FALSE, - 'trim_length' => 80, - ], + 'settings' => ['image_style' => ''], ]; $expected_url = file_create_url($image_uri); $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);