diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index d044f06882fcca31c8cd0e100d75b28962469144..126faf5e11465d96f442372f78450d064a5cbbb6 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2533,6 +2533,9 @@ function template_preprocess_html(&$variables) {
$variables['head_title_array'] = $head_title;
$variables['head_title'] = implode(' | ', $head_title);
+ // Mobile Metatags, used for Responsive Webdesign, the Metatags are added in html.tpl.php
+ $variables['mobile_metatags'] = TRUE;
+
// Populate the page template suggestions.
if ($suggestions = theme_get_suggestions(arg(), 'html')) {
$variables['theme_hook_suggestions'] = $suggestions;
diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php
index 960eefbdb63b6b1278799357c79ba4cdc4f4efba..b8893aee8704b713945ce4c1dcfad5bbe8ab6185 100644
--- a/core/modules/system/html.tpl.php
+++ b/core/modules/system/html.tpl.php
@@ -46,6 +46,12 @@
<?php print $head_title; ?>
+
+
+
+
+
+
>
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 9287d16d8a0137ff73b294565836914b58401806..d6549621f9e2844953a2a1a1ab9c529d5442d711 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -880,6 +880,35 @@ class AdminMetaTagTestCase extends DrupalWebTestCase {
}
}
+class MobileMetaTagTestCase extends DrupalWebTestCase {
+ /**
+ * Implement getInfo().
+ */
+ public static function getInfo() {
+ return array(
+ 'name' => 'Mobile meta tags',
+ 'description' => 'Confirm that the mobile meta tags appear as expected.',
+ 'group' => 'System'
+ );
+ }
+
+ /**
+ * Verify that the meta tag HTML is generated correctly.
+ */
+ public function testMetaTag() {
+ $metatags = array(
+ 'MobileOptimized' => '',
+ 'apple-mobile-web-app-capable' => '',
+ 'HandheldFriendly' => '',
+ 'viewport' => ''
+ );
+ $this->drupalGet('');
+ foreach ($metatags as $name => $metatag) {
+ $this->assertRaw($metatag, t('Mobile meta tag "'.$name.'" generated correctly.'), t('System'));
+ }
+ }
+}
+
/**
* Tests custom access denied functionality.
*/