Changeset 48412

Timestamp:

07/09/2020 11:27:28 PM (4 years ago)

Author:

whyisjake

Message:

Administration: Remove multiple viewport meta tags from mobile pages.

In addition, add the wp_admin_viewport_meta() function, paired to the admin_viewport_meta filter to control attributes of the meta tag.

Fixes #47369.
Props BettyJJ, mukesh27, SergeyBiryukov, ajayghaghretiya1, msaggiorato, talldanwp, davidbaumwald, donmhico, audrasjb.

Location:

trunk/src/wp-admin

Files:

• admin-header.php (modified) (1 diff)
• customize.php (modified) (2 diffs)
• includes/admin-filters.php (modified) (1 diff)
• includes/misc.php (modified) (1 diff)

trunk/src/wp-admin/admin-header.php

@@ -91 +91 @@
     isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
 <?php
 

trunk/src/wp-admin/customize.php

@@ -133 +133 @@
 if ( wp_is_mobile() ) :
     $body_class .= ' mobile';
-
-    ?>
-    <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" />
-    <?php
+    add_filter( 'admin_viewport_meta', '_customizer_mobile_viewport_meta' );
 endif;
 
@@ -172 +169 @@
  */
 do_action( 'customize_controls_print_scripts' );
+
+/**
+ * Fires when Customizer control scripts are printed.
+ *
+ * @since 5.5.0
+ */
+do_action( 'customize_controls_head' );
 ?>
 </head>

trunk/src/wp-admin/includes/admin-filters.php

@@ -45 +45 @@
 add_action( 'admin_head', 'wp_color_scheme_settings' );
 add_action( 'admin_head', 'wp_site_icon' );
-add_action( 'admin_head', '_ipad_meta' );
+add_action( 'admin_head', 'wp_admin_viewport_meta' );
+add_action( 'customize_controls_head', 'wp_admin_viewport_meta' );
 
 // Prerendering.

trunk/src/wp-admin/includes/misc.php

@@ -1015 +1015 @@
 
 /**
- * @since 3.3.0
- */
-function _ipad_meta() {
-    if ( wp_is_mobile() ) {
-        ?>
-        <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
-        <?php
-    }
+ * Displays the viewport meta in the admin.
+ *
+ * @since 5.5.0
+ */
+function wp_admin_viewport_meta() {
+    /**
+     * Filters the viewport meta in the admin.
+     *
+     * @since 5.5.0
+     *
+     * @param string $viewport_meta The viewport meta.
+     */
+    $viewport_meta = apply_filters( 'admin_viewport_meta', 'width=device-width,initial-scale=1.0' );
+    if ( empty( $viewport_meta ) ) {
+        return;
+    }
+    echo '<meta name="viewport" content="' . esc_attr( $viewport_meta ) . '">';
+}
+
+/**
+ * Viewport meta for mobile in customize.
+ *
+ * Hooked to the {@see 'admin_viewport_meta'} filter.
+ *
+ * @since 5.5.0
+ */
+function _customizer_mobile_viewport_meta( $content ) {
+    return trim( $content, ',' ) . ',minimum-scale=0.5,maximum-scale=1.2';
 }