Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wp_head performance regression for classic themes #3536

Closed
wants to merge 15 commits into from
Closed

Fix wp_head performance regression for classic themes #3536

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
787b2c2
Avoid parsing core's theme.json and theme-i18n.json when using a clas…
felixarntz Oct 27, 2022
aff6347
Avoid DB query for global styles when using a classic theme without s…
felixarntz Oct 27, 2022
196c215
Merge branch 'trunk' into fix/classic-themes-wp_head-regression
felixarntz Nov 2, 2022
0c768d3
Further optimize WP_Theme_JSON_Resolver logic for classic themes, use…
felixarntz Nov 2, 2022
b9ff774
Add demo version of theme-json.php from WP core theme.json (via var_e…
felixarntz Nov 2, 2022
f34fe53
Merge branch 'trunk' into fix/classic-themes-wp_head-regression
felixarntz Nov 8, 2022
6a835a4
Remove temporary theme.json in favor of https://github.com/WordPress/…
felixarntz Nov 8, 2022
1ab511c
Include parsing parent theme.json logic in cached logic block.
felixarntz Nov 8, 2022
bf4e711
Merge branch 'trunk' into fix/classic-themes-wp_head-regression
felixarntz Nov 9, 2022
4966109
Add test coverage and fix relevant tests to require a block theme.
felixarntz Nov 9, 2022
3a24f75
Merge branch 'trunk' into fix/classic-themes-wp_head-regression
felixarntz Nov 9, 2022
34c1957
Address code review feedback.
felixarntz Nov 9, 2022
392391a
Limit comment to 80 characters per line.
felixarntz Nov 10, 2022
782c49d
Merge branch 'trunk' into fix/classic-themes-wp_head-regression
felixarntz Nov 10, 2022
3ab53bf
Merge branch 'fix/classic-themes-wp_head-regression' of github.com:fe…
felixarntz Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/wp-includes/class-wp-theme-json-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,12 @@ public static function get_core_data() {
return static::$core;
}

$config = static::read_json_file( __DIR__ . '/theme.json' );
$config = static::translate( $config );
if ( static::theme_has_support() ) {
$config = static::read_json_file( __DIR__ . '/theme.json' );
$config = static::translate( $config );
} else {
$config = array();
}

/**
* Filters the default data provided by WordPress for global styles & settings.
Expand Down Expand Up @@ -246,8 +250,12 @@ public static function get_theme_data( $deprecated = array(), $options = array()
$options = wp_parse_args( $options, array( 'with_supports' => true ) );

if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {
$theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) );
$theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
if ( static::theme_has_support() ) {
$theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) );
$theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
} else {
$theme_json_data = array();
}

/**
* Filters the data provided by the theme for global styles and settings.
Expand Down Expand Up @@ -400,6 +408,9 @@ private static function remove_json_comments( $array ) {
* @return array Custom Post Type for the user's origin config.
*/
public static function get_user_data_from_wp_global_styles( $theme, $create_post = false, $post_status_filter = array( 'publish' ) ) {
if ( ! static::theme_has_support() ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only edge case I can think of is a theme that uses theme.json and removes it in a later version. In that case, this changes the behavior: the code will now ignore user data while it was used before.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YES! Love this change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a fair point. However, I would consider this indeed an edge-case which I don't think is worth addressing here. If a theme removed its theme.json it would come with a whole lot of other behavioral changes anyway - I don't think realistically any theme author is going to change a block theme to become a classic theme.

return array();
}
if ( ! $theme instanceof WP_Theme ) {
$theme = wp_get_theme();
}
Expand Down
3 changes: 2 additions & 1 deletion src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2934,7 +2934,8 @@ public function get_data() {
public function set_spacing_sizes() {
$spacing_scale = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'spacingScale' ), array() );

if ( ! is_numeric( $spacing_scale['steps'] )
if ( ! isset( $spacing_scale['steps'] )
|| ! is_numeric( $spacing_scale['steps'] )
|| ! isset( $spacing_scale['mediumStep'] )
|| ! isset( $spacing_scale['unit'] )
|| ! isset( $spacing_scale['operator'] )
Expand Down