From b9c47a3f469b0a95f78a03b9798796e261bc2ec6 Mon Sep 17 00:00:00 2001 From: catch Date: Sat, 19 Nov 2011 00:06:47 +0900 Subject: [PATCH] Issue #1174756 by linclark, karschsp, amateescu, rupl: Convert markup to HTML5. --- core/includes/common.inc | 7 +------ core/modules/simpletest/drupal_web_test_case.php | 2 +- core/modules/simpletest/tests/common.test | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/includes/common.inc b/core/includes/common.inc index f8d1aab7f19..919bfb594cb 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -299,8 +299,7 @@ function _drupal_default_html_head() { '#type' => 'html_tag', '#tag' => 'meta', '#attributes' => array( - 'http-equiv' => 'Content-Type', - 'content' => 'text/html; charset=utf-8', + 'charset' => 'utf-8', ), // Security: This always has to be output first. '#weight' => -1000, @@ -3198,16 +3197,12 @@ function drupal_pre_render_styles($elements) { '#type' => 'html_tag', '#tag' => 'link', '#attributes' => array( - 'type' => 'text/css', 'rel' => 'stylesheet', ), ); $style_element_defaults = array( '#type' => 'html_tag', '#tag' => 'style', - '#attributes' => array( - 'type' => 'text/css', - ), ); // Loop through each group. diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index 9d993d47545..ca6614396fb 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -1682,7 +1682,7 @@ class DrupalWebTestCase extends DrupalTestCase { // DOM can load HTML soup. But, HTML soup can throw warnings, suppress // them. $htmlDom = new DOMDocument(); - @$htmlDom->loadHTML($this->drupalGetContent()); + @$htmlDom->loadHTML('' . $this->drupalGetContent()); if ($htmlDom) { $this->pass(t('Valid HTML found on "@path"', array('@path' => $this->getUrl())), t('Browser')); // It's much easier to work with simplexml than DOM, luckily enough diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test index 78da5e42454..a5ab24923c9 100644 --- a/core/modules/simpletest/tests/common.test +++ b/core/modules/simpletest/tests/common.test @@ -669,7 +669,7 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase { */ function testRenderInlinePreprocess() { $css = 'body { padding: 0px; }'; - $css_preprocessed = ''; + $css_preprocessed = ''; drupal_add_css($css, array('type' => 'inline')); $styles = drupal_get_css(); $this->assertEqual(trim($styles), $css_preprocessed, t('Rendering preprocessed inline CSS adds it to the page.'));