WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Themes: Use `get_theme_file_path()` in `wp_theme_has_theme_json()`. 

Ensure that all places where `theme.json` is included, use `get_theme_file_path` or `WP_Theme->get_file_path`, so that the path is run through `theme_file_path` filter. This change also means that the method `get_file_path_from_theme` can be deprecated, as it is no longer used in core. 

Props flixos90, spacedmonkey, costdev, johnbillion, oglekler, hellofromtonya, mukesh27, audrasjb, oandregal.
Fixes #57629.
Built from https://develop.svn.wordpress.org/trunk@56073


git-svn-id: http://core.svn.wordpress.org/trunk@55585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
spacedmonkey 2023-06-27 17:12:26 +00:00
parent 26a0bf0049
commit 1afbc5b8a7
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-theme-json-resolver.php
View File

@ -238,9 +238,9 @@ class WP_Theme_JSON_Resolver {
$options = wp_parse_args( $options, array( 'with_supports' => true ) ); $options = wp_parse_args( $options, array( 'with_supports' => true ) );
if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) { if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {
$theme_json_file = static::get_file_path_from_theme( 'theme.json' );
$wp_theme = wp_get_theme(); $wp_theme = wp_get_theme();
if ( '' !== $theme_json_file ) { $theme_json_file = $wp_theme->get_file_path( 'theme.json' );
if ( is_readable( $theme_json_file ) ) {
$theme_json_data = static::read_json_file( $theme_json_file ); $theme_json_data = static::read_json_file( $theme_json_file );
$theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) ); $theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) );
} else { } else {
@ -260,8 +260,8 @@ class WP_Theme_JSON_Resolver {
if ( $wp_theme->parent() ) { if ( $wp_theme->parent() ) {
// Get parent theme.json. // Get parent theme.json.
$parent_theme_json_file = static::get_file_path_from_theme( 'theme.json', true ); $parent_theme_json_file = $wp_theme->parent()->get_file_path( 'theme.json' );
if ( '' !== $parent_theme_json_file ) { if ( $theme_json_file !== $parent_theme_json_file && is_readable( $parent_theme_json_file ) ) {
$parent_theme_json_data = static::read_json_file( $parent_theme_json_file ); $parent_theme_json_data = static::read_json_file( $parent_theme_json_file );
$parent_theme_json_data = static::translate( $parent_theme_json_data, $wp_theme->parent()->get( 'TextDomain' ) ); $parent_theme_json_data = static::translate( $parent_theme_json_data, $wp_theme->parent()->get( 'TextDomain' ) );
$parent_theme = new WP_Theme_JSON( $parent_theme_json_data ); $parent_theme = new WP_Theme_JSON( $parent_theme_json_data );

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

@ -408,12 +408,7 @@ function wp_theme_has_theme_json() {
} }
// Does the theme have its own theme.json? // Does the theme have its own theme.json?
$theme_has_support = is_readable( get_stylesheet_directory() . '/theme.json' ); $theme_has_support = is_readable( get_theme_file_path( 'theme.json' ) );
// Look up the parent if the child does not have a theme.json.
if ( ! $theme_has_support ) {
$theme_has_support = is_readable( get_template_directory() . '/theme.json' );
}
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-56072'; $wp_version = '6.3-alpha-56073';
/** /**
* 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.