diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 5ea77ea..82f3b3e 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2533,7 +2533,7 @@ function template_preprocess_html(&$variables) { $variables['head_title_array'] = $head_title; $variables['head_title'] = implode(' | ', $head_title); - // Mobile Metatags, used for Responsive Webdesign. Metatags are added in html.tpl.php + // Display the html.tpl.php’s default mobile metatags for responsive design. $variables['default_mobile_metatags'] = TRUE; // Populate the page template suggestions. diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php index d587dcc..8a715c7 100644 --- a/core/modules/system/html.tpl.php +++ b/core/modules/system/html.tpl.php @@ -22,8 +22,8 @@ * - slogan: The slogan of the site, if any, and if there is no title. * - $head: Markup for the HEAD section (including meta tags, keyword tags, and * so on). - * - $default_mobile_metatags: (boolean) If TRUE, default mobile metatags for - * Responsive Design will be included. + * - $default_mobile_metatags: TRUE if default mobile metatags for responsive + * design should be displayed. * - $styles: Style tags necessary to import all CSS files for the page. * - $scripts: Script tags necessary to load the JavaScript files and settings * for the page. diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 76abf11..adcbf3a 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -894,13 +894,11 @@ class DefaultMobileMetaTagsTestCase extends DrupalWebTestCase { function setUp() { parent::setUp(); - - // Create an administrative user. $this->default_metatags = array( 'MobileOptimized' => '', - 'apple-mobile-web-app-capable' => '', 'HandheldFriendly' => '', 'viewport' => '', + 'apple-mobile-web-app-capable' => '', 'cleartype' => '' ); } @@ -911,18 +909,18 @@ class DefaultMobileMetaTagsTestCase extends DrupalWebTestCase { public function testDefaultMetaTagsExist() { $this->drupalGet(''); foreach ($this->default_metatags as $name => $metatag) { - $this->assertRaw($metatag, t('Default Mobile meta tag "'.$name.'" generated correctly.'), t('System')); + $this->assertRaw($metatag, t('Default Mobile meta tag "' . $name . '" displayed properly.'), t('System')); } } /** - * Verify that the default mobile meta tags can be removed by a contrib module/theme + * Verify that the default mobile meta tags can be removed. */ public function testRemovingDefaultMetaTags() { module_enable(array('system_module_test')); $this->drupalGet(''); foreach ($this->default_metatags as $name => $metatag) { - $this->assertNoRaw($metatag, t('Default Mobile meta tag "'.$name.'" does not exist.'), t('System')); + $this->assertNoRaw($metatag, t('Default Mobile meta tag "' . $name . '" removed properly.'), t('System')); } } } diff --git a/core/modules/system/tests/system_module_test.module b/core/modules/system/tests/system_module_test.module index 00808d2..ec90b15 100644 --- a/core/modules/system/tests/system_module_test.module +++ b/core/modules/system/tests/system_module_test.module @@ -7,4 +7,4 @@ function system_module_test_preprocess_html(&$variables) { $variables['default_mobile_metatags'] = FALSE; -} \ No newline at end of file +}