Changeset 55146 for trunk/src/wp-includes/block-editor.php

Timestamp:

01/26/2023 06:37:47 PM (4 years 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.

File:

• trunk/src/wp-includes/block-editor.php (modified) (3 diffs)

trunk/src/wp-includes/block-editor.php

@@ -217 +217 @@
                 'defaultEditorStyles'              => $default_editor_styles,
                 'blockCategories'                  => get_default_block_categories(),
-                'disableCustomColors'              => get_theme_support( 'disable-custom-colors' ),
-                'disableCustomFontSizes'           => get_theme_support( 'disable-custom-font-sizes' ),
-                'disableCustomGradients'           => get_theme_support( 'disable-custom-gradients' ),
-                'disableLayoutStyles'              => get_theme_support( 'disable-layout-styles' ),
-                'enableCustomLineHeight'           => get_theme_support( 'custom-line-height' ),
-                'enableCustomSpacing'              => get_theme_support( 'custom-spacing' ),
-                'enableCustomUnits'                => get_theme_support( 'custom-units' ),
                 'isRTL'                            => is_rtl(),
                 'imageDefaultSize'                 => $image_default_size,
@@ -234 +227 @@
         );
 
-        // Theme settings.
-        $color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
-        if ( false !== $color_palette ) {
-                $editor_settings['colors'] = $color_palette;
-        }
-
-        $font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
-        if ( false !== $font_sizes ) {
-                $editor_settings['fontSizes'] = $font_sizes;
-        }
-
-        $gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
-        if ( false !== $gradient_presets ) {
-                $editor_settings['gradients'] = $gradient_presets;
+        $theme_settings = get_classic_theme_supports_block_editor_settings();
+        foreach ( $theme_settings as $key => $value ) {
+                $editor_settings[ $key ] = $value;
         }
 
@@ -695 +677 @@
         return $styles;
 }
+
+/**
+ * Returns the classic theme supports settings for block editor.
+ *
+ * @since 6.2.0
+ *
+ * @return array The classic theme supports settings.
+ */
+function get_classic_theme_supports_block_editor_settings() {
+        $theme_settings = array(
+                'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
+                'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
+                'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ),
+                'disableLayoutStyles'    => get_theme_support( 'disable-layout-styles' ),
+                'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ),
+                'enableCustomSpacing'    => get_theme_support( 'custom-spacing' ),
+                'enableCustomUnits'      => get_theme_support( 'custom-units' ),
+        );
+
+        // Theme settings.
+        $color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
+        if ( false !== $color_palette ) {
+                $theme_settings['colors'] = $color_palette;
+        }
+
+        $font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
+        if ( false !== $font_sizes ) {
+                $theme_settings['fontSizes'] = $font_sizes;
+        }
+
+        $gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
+        if ( false !== $gradient_presets ) {
+                $theme_settings['gradients'] = $gradient_presets;
+        }
+
+        return $theme_settings;
+}