From 0999a01956868243ef2b89a4a852d79e91f6dad1 Mon Sep 17 00:00:00 2001 From: Jake Spurlock Date: Thu, 9 Jul 2020 23:27:28 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@48412 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/admin-header.php | 1 - src/wp-admin/customize.php | 12 ++++++---- src/wp-admin/includes/admin-filters.php | 3 ++- src/wp-admin/includes/misc.php | 32 ++++++++++++++++++++----- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index afdeed02f9..34d83d750a 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -90,7 +90,6 @@ var ajaxurl = '', decimalPoint = 'number_format['decimal_point'] ); ?>', isRtl = ; - - - is_ios() ) { @@ -171,6 +168,13 @@ do_action( 'customize_controls_print_styles' ); * @since 3.4.0 */ do_action( 'customize_controls_print_scripts' ); + +/** + * Fires when Customizer control scripts are printed. + * + * @since 5.5.0 + */ +do_action( 'customize_controls_head' ); ?> diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php index 345a6114af..7b491c36b7 100644 --- a/src/wp-admin/includes/admin-filters.php +++ b/src/wp-admin/includes/admin-filters.php @@ -44,7 +44,8 @@ add_action( 'login_init', 'wp_admin_headers' ); add_action( 'admin_head', 'wp_admin_canonical_url' ); 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. if ( ! is_customize_preview() ) { diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php index 41fe4ae9fb..d17c2ef232 100644 --- a/src/wp-admin/includes/misc.php +++ b/src/wp-admin/includes/misc.php @@ -1014,14 +1014,34 @@ function wp_color_scheme_settings() { } /** - * @since 3.3.0 + * Displays the viewport meta in the admin. + * + * @since 5.5.0 */ -function _ipad_meta() { - if ( wp_is_mobile() ) { - ?> - - '; +} + +/** + * 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'; } /**