Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-17 08:05:21 +01:00
Code Issues Projects Releases Wiki Activity

Script Loader: Prevent fatal error in load-styles.php.

Browse Source 
Duplicates the code of `get_theme_file_path()` within `wp_theme_has_theme_json()`. This is to account for the `load-styles.php` context in which the former function is unavailable.

Follow up to [56073].

Props SergeyBiryukov, oglekler, spacedmonkey, joemcgill, dd32.
Fixes #57629.


Built from https://develop.svn.wordpress.org/trunk@56085


git-svn-id: http://core.svn.wordpress.org/trunk@55597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Peter Wilson 2023-06-28 05:57:28 +00:00
parent 4182e51552
commit b72be00111
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,8 +407,21 @@ function wp_theme_has_theme_json() {
return $theme_has_support;
}
// Does the theme have its own theme.json?
$theme_has_support = is_readable( get_theme_file_path( 'theme.json' ) );
// 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' ) ) {
$path = get_stylesheet_directory() . '/theme.json';
} else {
$path = get_template_directory() . '/theme.json';
}
/** This filter is documented in wp-includes/link-template.php */
$path = apply_filters( 'theme_file_path', $path, 'theme.json' );
if ( file_exists( $path ) ) {
$theme_has_support = true;
} else {
$theme_has_support = false;
}
return $theme_has_support;
}

2
wp-includes/version.php
View File

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