Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / file / src / Plugin / Field / FieldFormatter / GenericFileFormatter.php

diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
index daeb9f42c22a1de1a2f07e12fa5ba174dcc36133..7f35f3bee541556f6243d8c3fae2237edf3b598e 100644 (file)
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
@@ -15,7 +15,7 @@ use Drupal\Core\Field\FieldItemListInterface;
  *   }
  * )
  */
-class GenericFileFormatter extends FileFormatterBase {
+class GenericFileFormatter extends DescriptionAwareFileFormatterBase {
 
   /**
    * {@inheritdoc}
@@ -28,7 +28,7 @@ class GenericFileFormatter extends FileFormatterBase {
       $elements[$delta] = [
         '#theme' => 'file_link',
         '#file' => $file,
-        '#description' => $item->description,
+        '#description' => $this->getSetting('use_description_as_link_text') ? $item->description : NULL,
         '#cache' => [
           'tags' => $file->getCacheTags(),
         ],