Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 22:35:02 +02:00
Code Issues Projects Releases Wiki Activity

Themes: Use improved support for child themes in wp_theme_has_theme_json().

Browse Source 
Improve logic in `wp_theme_has_theme_json()`, to only check to see if theme.json exists in child theme, if the current theme is a child theme. Without this change, `file_exists` would be called twice on every request, which is wasteful. 

Follow up to [56085]. 

Props spacedmonkey, SergeyBiryukov.
Fixes #57629.
Built from https://develop.svn.wordpress.org/trunk@56094


git-svn-id: http://core.svn.wordpress.org/trunk@55606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
spacedmonkey 2023-06-28 17:14:27 +00:00
parent d72667d737
commit e9004a5b48
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/global-styles-and-settings.php
View File

@ -407,21 +407,20 @@ function wp_theme_has_theme_json() {
return $theme_has_support; return $theme_has_support;
} }
$stylesheet_directory = get_stylesheet_directory();
$template_directory = get_template_directory();
// This is the same as get_theme_file_path(), which isn't available in load-styles.php context // This is the same as get_theme_file_path(), which isn't available in load-styles.php context
if ( file_exists( get_stylesheet_directory() . '/theme.json' ) ) { if ( $stylesheet_directory !== $template_directory && file_exists( $stylesheet_directory . '/theme.json' ) ) {
$path = get_stylesheet_directory() . '/theme.json'; $path = $stylesheet_directory . '/theme.json';
} else { } else {
$path = get_template_directory() . '/theme.json'; $path = $template_directory . '/theme.json';
} }
/** This filter is documented in wp-includes/link-template.php */ /** This filter is documented in wp-includes/link-template.php */
$path = apply_filters( 'theme_file_path', $path, 'theme.json' ); $path = apply_filters( 'theme_file_path', $path, 'theme.json' );
if ( file_exists( $path ) ) { $theme_has_support = file_exists( $path );
$theme_has_support = true;
} else {
$theme_has_support = false;
}
return $theme_has_support; return $theme_has_support;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.3-alpha-56093'; $wp_version = '6.3-alpha-56094';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.