diff --git a/core/modules/system/src/Tests/Installer/InstallerTest.php b/core/modules/system/src/Tests/Installer/InstallerTest.php index ee53a4e5b37c2b2268aefe068e8b66238c626152..b17e3e753553fe8b44e2565c4bd26cef3cd7f319 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerTest.php @@ -39,7 +39,7 @@ protected function setUpLanguage() { // Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets and // metatags as expected to the first page of the installer. $this->assertRaw('core/themes/seven/css/components/buttons.css'); - $this->assertRaw('<meta name="charset" charset="utf-8" />'); + $this->assertRaw('<meta charset="utf-8" />'); parent::setUpLanguage(); } } diff --git a/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php b/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php index 5739137f9cee7670a7265fd2ccb74ffbdb7aea8d..beb43c0d8b5952a61678c1afb409c416cee3d71f 100644 --- a/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php +++ b/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php @@ -22,12 +22,11 @@ class DefaultMetatagsTest extends WebTestBase { public function testMetaTag() { $this->drupalGet(''); // Ensures that the charset metatag is on the page. - $result = $this->xpath('//meta[@name="charset" and @charset="utf-8"]'); + $result = $this->xpath('//meta[@charset="utf-8"]'); $this->assertEqual(count($result), 1); // Ensure that the charset one is the first metatag. $result = $this->xpath('//meta'); - $this->assertEqual((string) $result[0]->attributes()->name, 'charset'); $this->assertEqual((string) $result[0]->attributes()->charset, 'utf-8'); // Ensure that the shortcut icon is on the page. diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 255449ecf6ecf107c6075acc7e6f7a918f02626f..7c6771471ca57e0e09e445404163f88eb14efb9c 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -551,7 +551,6 @@ function system_page_attachments(array &$page) { 'system_meta_content_type' => array( '#tag' => 'meta', '#attributes' => array( - 'name' => 'charset', 'charset' => 'utf-8', ), // Security: This always has to be output first.