Make WordPress Core

Changeset 55146


Ignore:
Timestamp:
01/26/2023 06:37:47 PM (13 months ago)
Author:
flixos90
Message:

Themes: Avoid unnecessary database queries from get_default_block_editor_settings() in WP_Theme_JSON_Resolver::get_theme_data().

The get_default_block_editor_settings() function included several pieces of data that are irrelevant for the purpose that WP_Theme_JSON_Resolver was calling it for, yet resulted in three database queries on page load that can be avoided.

This changeset introduces a new function get_classic_theme_supports_block_editor_settings() to takes responsibility of only the data needed in WP_Theme_JSON_Resolver, which now uses that function. This leads to a reduction of database queries and accordingly a performance improvement.

Props mamaduka, spacedmonkey, oandregal, flixos90, audrasjb, mukesh27.
Fixes #57547.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/block-editor.php

    r55086 r55146  
    217217        'defaultEditorStyles'              => $default_editor_styles,
    218218        'blockCategories'                  => get_default_block_categories(),
    219         'disableCustomColors'              => get_theme_support( 'disable-custom-colors' ),
    220         'disableCustomFontSizes'           => get_theme_support( 'disable-custom-font-sizes' ),
    221         'disableCustomGradients'           => get_theme_support( 'disable-custom-gradients' ),
    222         'disableLayoutStyles'              => get_theme_support( 'disable-layout-styles' ),
    223         'enableCustomLineHeight'           => get_theme_support( 'custom-line-height' ),
    224         'enableCustomSpacing'              => get_theme_support( 'custom-spacing' ),
    225         'enableCustomUnits'                => get_theme_support( 'custom-units' ),
    226219        'isRTL'                            => is_rtl(),
    227220        'imageDefaultSize'                 => $image_default_size,
     
    234227    );
    235228
    236     // Theme settings.
    237     $color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
    238     if ( false !== $color_palette ) {
    239         $editor_settings['colors'] = $color_palette;
    240     }
    241 
    242     $font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
    243     if ( false !== $font_sizes ) {
    244         $editor_settings['fontSizes'] = $font_sizes;
    245     }
    246 
    247     $gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
    248     if ( false !== $gradient_presets ) {
    249         $editor_settings['gradients'] = $gradient_presets;
     229    $theme_settings = get_classic_theme_supports_block_editor_settings();
     230    foreach ( $theme_settings as $key => $value ) {
     231        $editor_settings[ $key ] = $value;
    250232    }
    251233
     
    695677    return $styles;
    696678}
     679
     680/**
     681 * Returns the classic theme supports settings for block editor.
     682 *
     683 * @since 6.2.0
     684 *
     685 * @return array The classic theme supports settings.
     686 */
     687function get_classic_theme_supports_block_editor_settings() {
     688    $theme_settings = array(
     689        'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
     690        'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
     691        'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ),
     692        'disableLayoutStyles'    => get_theme_support( 'disable-layout-styles' ),
     693        'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ),
     694        'enableCustomSpacing'    => get_theme_support( 'custom-spacing' ),
     695        'enableCustomUnits'      => get_theme_support( 'custom-units' ),
     696    );
     697
     698    // Theme settings.
     699    $color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
     700    if ( false !== $color_palette ) {
     701        $theme_settings['colors'] = $color_palette;
     702    }
     703
     704    $font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
     705    if ( false !== $font_sizes ) {
     706        $theme_settings['fontSizes'] = $font_sizes;
     707    }
     708
     709    $gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
     710    if ( false !== $gradient_presets ) {
     711        $theme_settings['gradients'] = $gradient_presets;
     712    }
     713
     714    return $theme_settings;
     715}
  • trunk/src/wp-includes/class-wp-theme-json-resolver.php

    r55128 r55146  
    287287         * and merge the static::$theme upon that.
    288288         */
    289         $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
     289        $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
    290290        if ( ! wp_theme_has_theme_json() ) {
    291291            if ( ! isset( $theme_support_data['settings']['color'] ) ) {
  • trunk/tests/phpunit/tests/blocks/editor.php

    r54891 r55146  
    570570
    571571    /**
     572     * @ticket 57547
     573     *
     574     * @covers ::get_classic_theme_supports_block_editor_settings
     575     */
     576    public function test_get_classic_theme_supports_block_editor_settings() {
     577        $font_sizes = array(
     578            array(
     579                'name' => 'Small',
     580                'size' => 12,
     581                'slug' => 'small',
     582            ),
     583            array(
     584                'name' => 'Regular',
     585                'size' => 16,
     586                'slug' => 'regular',
     587            ),
     588        );
     589
     590        add_theme_support( 'editor-font-sizes', $font_sizes );
     591        $settings = get_classic_theme_supports_block_editor_settings();
     592        remove_theme_support( 'editor-font-sizes' );
     593
     594        $this->assertFalse( $settings['disableCustomColors'], 'Value for array key "disableCustomColors" does not match expectations' );
     595        $this->assertFalse( $settings['disableCustomFontSizes'], 'Value for array key "disableCustomFontSizes" does not match expectations' );
     596        $this->assertFalse( $settings['disableCustomGradients'], 'Value for array key "disableCustomGradients" does not match expectations' );
     597        $this->assertFalse( $settings['disableLayoutStyles'], 'Value for array key "disableLayoutStyles" does not match expectations' );
     598        $this->assertFalse( $settings['enableCustomLineHeight'], 'Value for array key "enableCustomLineHeight" does not match expectations' );
     599        $this->assertFalse( $settings['enableCustomSpacing'], 'Value for array key "enableCustomSpacing" does not match expectations' );
     600        $this->assertFalse( $settings['enableCustomUnits'], 'Value for array key "enableCustomUnits" does not match expectations' );
     601
     602        $this->assertSame(
     603            $font_sizes,
     604            $settings['fontSizes'],
     605            'Value for array key "fontSizes" does not match expectations'
     606        );
     607    }
     608
     609    /**
    572610     * Data provider.
    573611     *
  • trunk/tests/phpunit/tests/theme/wpThemeJson.php

    r55008 r55146  
    26462646    public function test_get_editor_settings_custom_units_can_be_disabled() {
    26472647        add_theme_support( 'custom-units', array() );
    2648         $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
     2648        $actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
    26492649        remove_theme_support( 'custom-units' );
    26502650
     
    26632663    public function test_get_editor_settings_custom_units_can_be_enabled() {
    26642664        add_theme_support( 'custom-units' );
    2665         $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
     2665        $actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
    26662666        remove_theme_support( 'custom-units' );
    26672667
     
    26802680    public function test_get_editor_settings_custom_units_can_be_filtered() {
    26812681        add_theme_support( 'custom-units', 'rem', 'em' );
    2682         $actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
     2682        $actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
    26832683        remove_theme_support( 'custom-units' );
    26842684
Note: See TracChangeset for help on using the changeset viewer.