diff -u b/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php --- b/core/lib/Drupal/Component/Utility/Html.php +++ b/core/lib/Drupal/Component/Utility/Html.php @@ -399,12 +399,12 @@ * This method is the opposite of Html::escape(). * * @param $text - * The input text + * The input text. * * @return string * The text with all HTML entities decoded back to characters. */ - public static function descape($text) { + public static function unescape($text) { return htmlspecialchars_decode($text, ENT_QUOTES | ENT_SUBSTITUTE); } diff -u b/core/modules/views/src/Tests/FieldApiDataTest.php b/core/modules/views/src/Tests/FieldApiDataTest.php --- b/core/modules/views/src/Tests/FieldApiDataTest.php +++ b/core/modules/views/src/Tests/FieldApiDataTest.php @@ -31,7 +31,7 @@ ); entity_create('field_config', $field)->save(); - // Attach the same to a different bundle with a different label. + // Attach the same field to a different bundle with a different label. $this->drupalCreateContentType(['type' => 'article']); $field = FieldConfig::create([ 'field_name' => $field_names[0], diff -u b/core/modules/views/views.api.php b/core/modules/views/views.api.php --- b/core/modules/views/views.api.php +++ b/core/modules/views/views.api.php @@ -588,7 +588,7 @@ 'field field' => $field_name . '_target_id', 'base' => $entity_type->getBaseTable(), 'base field' => $entity_type->getKey('id'), - 'label' => t('@field_name', array('@field_name' => $field_name)), + 'label' => $field_name, 'join_extra' => array( 0 => array( 'field' => 'deleted', diff -u b/core/modules/views/views.views.inc b/core/modules/views/views.views.inc --- b/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -454,7 +454,7 @@ if ($aliases) { $data[$table_alias][$field_alias]['aliases'] = $aliases; // Decode the entities, as they might have been escaped before. - $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: ') . Html::descape(implode(', ', $also_known)); + $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: ') . Html::unescape(implode(', ', $also_known)); } $keys = array_keys($field_columns); @@ -556,7 +556,7 @@ if ($aliases) { $data[$table_alias][$column_real_name]['aliases'] = $aliases; // Decode the entities, as they might have been escaped before. - $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: ') . Html::descape(implode(', ', $also_known)); + $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: ') . Html::unescape(implode(', ', $also_known)); } $data[$table_alias][$column_real_name]['argument'] = array( diff -u b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php --- b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php @@ -311,21 +311,21 @@ } /** - * Tests Html::descape(). + * Tests Html::unescape(). * - * @dataProvider providerDescape - * @covers ::descape + * @dataProvider providerUnescape + * @covers ::unescape */ - public function testDescape($expected, $text) { - $this->assertEquals($expected, Html::descape($text)); + public function testUnescape($expected, $text) { + $this->assertEquals($expected, Html::unescape($text)); } /** - * Data provider for testDescape(). + * Data provider for testUnescape(). * - * @see testDescape() + * @see testUnescape() */ - public function providerDescape() { + public function providerUnescape() { return [ ['Drupal', 'Drupal'], ['