diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php index 56532ba..ccc99d2 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php @@ -54,7 +54,7 @@ public function settingsSummary() { $summary = parent::settingsSummary(); if ($this->getSetting('native_language')) { $additional_summary = $this->t('Displayed in native language'); - if (!empty($summary['#markup'])) { + if (!empty($summary)) { $summary[] .= '; ' . $additional_summary; } else { diff --git a/core/modules/node/src/Tests/Views/NodeLanguageTest.php b/core/modules/node/src/Tests/Views/NodeLanguageTest.php index 613d1ae..47e4391 100644 --- a/core/modules/node/src/Tests/Views/NodeLanguageTest.php +++ b/core/modules/node/src/Tests/Views/NodeLanguageTest.php @@ -22,7 +22,7 @@ class NodeLanguageTest extends NodeTestBase { /** * {@inheritdoc} */ - public static $modules = array('language'); + public static $modules = array('language', 'node_test_views'); /** * Views used by this test. diff --git a/core/modules/node/tests/modules/node_test_views/node_test_views.info.yml b/core/modules/node/tests/modules/node_test_views/node_test_views.info.yml index 194168f..27f8b58 100644 --- a/core/modules/node/tests/modules/node_test_views/node_test_views.info.yml +++ b/core/modules/node/tests/modules/node_test_views/node_test_views.info.yml @@ -7,3 +7,4 @@ core: 8.x dependencies: - node - views + - language diff --git a/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc b/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc new file mode 100644 index 0000000..37a2e81 --- /dev/null +++ b/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc @@ -0,0 +1,15 @@ +