Commit 8187a716 authored by catch's avatar catch
Browse files

Issue #3253897 by mohit_aghera, oily, joakland, smustgrave, lendude:... 

Issue #3253897 by mohit_aghera, oily, joakland, smustgrave, lendude: Regression: "Display the file download URI" on related file entity shows relative path

(cherry picked from commit fe2f9258)
parent 4a461d26

core/modules/file/src/Plugin/Field/FieldFormatter/FileUriFormatter.php

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) { 
  protected function viewValue(FieldItemInterface $item) {

    $value = $item->value;

    if ($this->getSetting('file_download_path')) {

      $value = $this->fileUrlGenerator->generateString($value);

      $value = $this->fileUrlGenerator->generateAbsoluteString($value);

    }

    return $value;

  }

core/modules/file/tests/src/Kernel/Formatter/FileEntityFormatterTest.php

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public function testFormatterFileUri(): void { 


    $entity_display->setComponent('uri', ['type' => 'file_uri', 'settings' => ['file_download_path' => TRUE]]);

    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];

    $this->assertEquals($this->fileUrlGenerator->generateString('public://file.png'), $build['#markup']);

    $this->assertEquals($this->fileUrlGenerator->generateAbsoluteString('public://file.png'), $build['#markup']);



    $entity_display->setComponent(

      'uri',
@@ -116,7 +116,7 @@ public function testFormatterFileUri(): void { 
      ]

    );

    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];

    $this->assertEquals($this->fileUrlGenerator->generateString('public://file.png'), $build['#title']);

    $this->assertEquals($this->fileUrlGenerator->generateAbsoluteString('public://file.png'), $build['#title']);

    $this->assertEquals($this->fileUrlGenerator->generate('public://file.png'), $build['#url']);

  }