From 9a53a21bedf342fc5dd73bdb9bc5f724c6d90ceb Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 9 May 2013 21:43:04 +0100
Subject: [PATCH] Issue #1823306 by webflo, mkalkbrenner, zuuperman, swentel:
Fixed Missing langcode in in hook_field_attach_view_alter().
---
core/modules/field/field.api.php | 2 +-
core/modules/field/field.module | 1 +
core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php | 1 +
core/modules/field/tests/modules/field_test/field_test.module | 4 ++++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 5ba15c958b8b..33f2581aba74 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -1085,7 +1085,7 @@ function hook_field_attach_purge(\Drupal\Core\Entity\EntityInterface $entity, $f
* $display_options argument and the view_mode element is set to '_custom'.
* See field_view_field() for more information on what its $display_options
* argument contains.
- * - language: The language code used for rendering.
+ * - langcode: The language code used for rendering.
*/
function hook_field_attach_view_alter(&$output, $context) {
// Append RDF term mappings on displayed taxonomy links.
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index db31d7790b8a..13fb22cadf53 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -866,6 +866,7 @@ function field_view_field(EntityInterface $entity, $field_name, $display_options
'entity' => $entity,
'view_mode' => $view_mode,
'display_options' => $display_options,
+ 'langcode' => $display_langcode,
);
drupal_alter('field_attach_view', $result, $context);
diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
index 09336417b145..39d959403a81 100644
--- a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
@@ -99,6 +99,7 @@ function testFieldViewField() {
$setting = $display['settings']['test_formatter_setting_multiple'];
$this->assertNoText($this->label, 'Label was not displayed.');
$this->assertText('field_test_field_attach_view_alter', 'Alter fired, display passed.');
+ $this->assertText('field language is ' . LANGUAGE_NOT_SPECIFIED, 'Language is placed onto the context.');
$array = array();
foreach ($this->values as $delta => $value) {
$array[] = $delta . ':' . $value['value'];
diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index c7e3b1cda0c2..15b3ea5873a7 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -193,6 +193,10 @@ function field_test_field_attach_view_alter(&$output, $context) {
if (!empty($context['display_options']['settings']['alter'])) {
$output['test_field'][] = array('#markup' => 'field_test_field_attach_view_alter');
}
+
+ if (isset($output['test_field'])) {
+ $output['test_field'][] = array('#markup' => 'field language is ' . $context['langcode']);
+ }
}
/**
--
GitLab