diff --git a/core/lib/Drupal/Core/Field/FormatterBase.php b/core/lib/Drupal/Core/Field/FormatterBase.php index 880c80d..5f9ff7c 100644 --- a/core/lib/Drupal/Core/Field/FormatterBase.php +++ b/core/lib/Drupal/Core/Field/FormatterBase.php @@ -78,7 +78,7 @@ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInter * {@inheritdoc} */ public function view(FieldItemListInterface $items, $langcode) { - $this->setMissingLangcode($langcode); + $this->languageFallback($langcode); $elements = $this->viewElements($items, $langcode); // If there are actual renderable children, use #theme => field, otherwise, @@ -110,9 +110,14 @@ public function view(FieldItemListInterface $items, $langcode) { } /** - * {@inheritdoc} + * Sets the language code variable to the current user interface language. + * + * @param string $langcode + * The language code passed by reference. If it is null/empty, it is set to + * the current user interface language. If it is already defined, nothing is + * done. */ - public function setMissingLangcode(&$langcode) { + public function languageFallback(&$langcode) { if (empty($langcode)) { $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(); } diff --git a/core/lib/Drupal/Core/Field/FormatterInterface.php b/core/lib/Drupal/Core/Field/FormatterInterface.php index df931c4..2d34f1a 100644 --- a/core/lib/Drupal/Core/Field/FormatterInterface.php +++ b/core/lib/Drupal/Core/Field/FormatterInterface.php @@ -79,16 +79,6 @@ public function prepareView(array $entities_items); public function view(FieldItemListInterface $items, $langcode); /** - * Sets the language code variable to the current user interface language. - * - * @param string $langcode - * The language code passed by reference. If it is null/empty, it is set to - * the current user interface language. If it is already defined, nothing is - * done. - */ - public function setMissingLangcode(&$langcode); - - /** * Builds a renderable array for a field value. * * @param \Drupal\Core\Field\FieldItemListInterface $items diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php index 53a7463..b98fc45 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php @@ -123,7 +123,6 @@ public function settingsSummary() { public function viewElements(FieldItemListInterface $items, $langcode) { $view_mode = $this->getSetting('view_mode'); $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { // Protect ourselves from recursive rendering. diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php index 5044fff..4b5922e 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php @@ -37,8 +37,8 @@ * * @param \Drupal\Core\Field\EntityReferenceFieldItemListInterface $items * The item list. - * @param $langcode - * The language code of entities. + * @param string $langcode + * The language code of the referenced entities to display. * * @return \Drupal\Core\Entity\EntityInterface[] * The array of referenced entities to display, keyed by delta. diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php index 02dac34..3b58c68 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php @@ -29,7 +29,6 @@ class EntityReferenceIdFormatter extends EntityReferenceFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { if ($entity->id()) { diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php index 53c06c5..5ee27c8 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php @@ -63,7 +63,6 @@ public function settingsSummary() { public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); $output_as_link = $this->getSetting('link'); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { $label = $entity->label(); diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php index a89d2fc..3c3c4ad 100644 --- a/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php +++ b/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php @@ -28,7 +28,6 @@ class GenericFileFormatter extends FileFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { $item = $file->_referringItem; diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php index 1b0e61d..fa5017d 100644 --- a/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php +++ b/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php @@ -28,7 +28,6 @@ class RSSEnclosureFormatter extends FileFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $entity = $items->getEntity(); - $this->setMissingLangcode($langcode); // Add the first file as an enclosure to the RSS item. RSS allows only one // enclosure per item. See: http://en.wikipedia.org/wiki/RSS_enclosure foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php index 8307973..c1d279d 100644 --- a/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php +++ b/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php @@ -28,7 +28,6 @@ class TableFormatter extends FileFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); if ($files = $this->getEntitiesToView($items, $langcode)) { $header = array(t('Attachment'), t('Size')); diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php index 96be320..6447078 100644 --- a/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php +++ b/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php @@ -28,7 +28,6 @@ class UrlPlainFormatter extends FileFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { $elements[$delta] = array( diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php index 2e58d2e..b68401b 100644 --- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php @@ -179,7 +179,6 @@ public function settingsSummary() { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); $files = $this->getEntitiesToView($items, $langcode); // Early opt-out if the field is empty. diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php index de96ba3..6f79497 100644 --- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php @@ -29,8 +29,6 @@ protected function getEntitiesToView(EntityReferenceFieldItemListInterface $item if (empty($default_image['uuid']) && $this->fieldDefinition instanceof FieldConfigInterface) { $default_image = $this->fieldDefinition->getFieldStorageDefinition()->getSetting('default_image'); } - $this->setMissingLangcode($langcode); - if (!empty($default_image['uuid']) && $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid'])) { // Clone the FieldItemList into a runtime-only object for the formatter, // so that the fallback image can be rendered without affecting the diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php index 826523a..01f18d4 100644 --- a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php +++ b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php @@ -32,7 +32,6 @@ class EntityReferenceTaxonomyTermRssFormatter extends EntityReferenceFormatterBa public function viewElements(FieldItemListInterface $items, $langcode) { $parent_entity = $items->getEntity(); $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { $parent_entity->rss_elements[] = array( diff --git a/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php b/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php index 7a6ef1b..5b37fc6 100644 --- a/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php +++ b/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php @@ -33,7 +33,6 @@ class AuthorFormatter extends EntityReferenceFormatterBase { */ public function viewElements(FieldItemListInterface $items, $langcode) { $elements = array(); - $this->setMissingLangcode($langcode); foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { /** @var $referenced_user \Drupal\user\UserInterface */