From 1af21df75bf78b644d7984e366c25793a3647761 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 23 Jun 2021 00:25:14 +0000 Subject: [PATCH] Editor: Correct variable names in `get_block_editor_settings()`. Incorrect variable names were leading to unreachable conditional statements. Follow up to [51149]. Props johnbillion, mukesh27. See #53458. git-svn-id: https://develop.svn.wordpress.org/trunk@51213 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/block-editor.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php index fc80ef3e1b..9b1aa739ad 100644 --- a/src/wp-includes/block-editor.php +++ b/src/wp-includes/block-editor.php @@ -310,27 +310,27 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex $editor_settings['__experimentalFeatures'] = $theme_json->get_settings(); // These settings may need to be updated based on data coming from theme.json sources. - if ( isset( $settings['__experimentalFeatures']['color']['palette'] ) ) { - $colors_by_origin = $settings['__experimentalFeatures']['color']['palette']; - $settings['colors'] = isset( $colors_by_origin['user'] ) ? + if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) { + $colors_by_origin = $editor_settings['__experimentalFeatures']['color']['palette']; + $editor_settings['colors'] = isset( $colors_by_origin['user'] ) ? $colors_by_origin['user'] : ( isset( $colors_by_origin['theme'] ) ? $colors_by_origin['theme'] : $colors_by_origin['core'] ); } - if ( isset( $settings['__experimentalFeatures']['color']['gradients'] ) ) { - $gradients_by_origin = $settings['__experimentalFeatures']['color']['gradients']; - $settings['gradients'] = isset( $gradients_by_origin['user'] ) ? + if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) { + $gradients_by_origin = $editor_settings['__experimentalFeatures']['color']['gradients']; + $editor_settings['gradients'] = isset( $gradients_by_origin['user'] ) ? $gradients_by_origin['user'] : ( isset( $gradients_by_origin['theme'] ) ? $gradients_by_origin['theme'] : $gradients_by_origin['core'] ); } - if ( isset( $settings['__experimentalFeatures']['typography']['fontSizes'] ) ) { - $font_sizes_by_origin = $settings['__experimentalFeatures']['typography']['fontSizes']; - $settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ? + if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) { + $font_sizes_by_origin = $editor_settings['__experimentalFeatures']['typography']['fontSizes']; + $editor_settings['fontSizes'] = isset( $font_sizes_by_origin['user'] ) ? $font_sizes_by_origin['user'] : ( isset( $font_sizes_by_origin['theme'] ) ? $font_sizes_by_origin['theme'] :