From e770b922c7a40b5fabf86d2c0c08d10c8fdd6039 Mon Sep 17 00:00:00 2001 From: isabel_brison Date: Fri, 1 Sep 2023 04:03:21 +0000 Subject: [PATCH] Editor: Don't use fluid layout value in typography. Changes fluid typography calculation to use fallback value if layout wide size is a fluid value. Props ramonopoly, mukesh27, jastos, aurooba. See #58754. Built from https://develop.svn.wordpress.org/trunk@56503 git-svn-id: http://core.svn.wordpress.org/trunk@56015 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-supports/typography.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/block-supports/typography.php b/wp-includes/block-supports/typography.php index 78c8b0a2ff..34345ca4ec 100644 --- a/wp-includes/block-supports/typography.php +++ b/wp-includes/block-supports/typography.php @@ -517,7 +517,7 @@ function wp_get_typography_font_size_value( $preset, $should_use_fluid_typograph : array(); // Defaults. - $default_maximum_viewport_width = isset( $layout_settings['wideSize'] ) ? $layout_settings['wideSize'] : '1600px'; + $default_maximum_viewport_width = isset( $layout_settings['wideSize'] ) && ! empty( wp_get_typography_value_and_unit( $layout_settings['wideSize'] ) ) ? $layout_settings['wideSize'] : '1600px'; $default_minimum_viewport_width = '320px'; $default_minimum_font_size_factor_max = 0.75; $default_minimum_font_size_factor_min = 0.25; diff --git a/wp-includes/version.php b/wp-includes/version.php index ea0ea564cf..09065f6a02 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56502'; +$wp_version = '6.4-alpha-56503'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.