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

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

diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
index 4da9e84366f44cc44f31d1696478ebf0947ed1a2..5bb3d94883972a9e608d933a5fa4626fda25f46f 100644 (file)
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
@@ -15,7 +15,7 @@ use Drupal\Core\Field\FieldItemListInterface;
  *   }
  * )
  */
-class TableFormatter extends FileFormatterBase {
+class TableFormatter extends DescriptionAwareFileFormatterBase {
 
   /**
    * {@inheritdoc}
@@ -27,11 +27,13 @@ class TableFormatter extends FileFormatterBase {
       $header = [t('Attachment'), t('Size')];
       $rows = [];
       foreach ($files as $delta => $file) {
+        $item = $file->_referringItem;
         $rows[] = [
           [
             'data' => [
               '#theme' => 'file_link',
               '#file' => $file,
+              '#description' => $this->getSetting('use_description_as_link_text') ? $item->description : NULL,
               '#cache' => [
                 'tags' => $file->getCacheTags(),
               ],