From b72be00111b2b914c3ff41b0764c9a339aa4c777 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 28 Jun 2023 05:57:28 +0000 Subject: [PATCH] Script Loader: Prevent fatal error in `load-styles.php`. 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 --- wp-includes/global-styles-and-settings.php | 17 +++++++++++++++-- wp-includes/version.php | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/wp-includes/global-styles-and-settings.php b/wp-includes/global-styles-and-settings.php index 7a8446d60e..d43bf347fa 100644 --- a/wp-includes/global-styles-and-settings.php +++ b/wp-includes/global-styles-and-settings.php @@ -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; } diff --git a/wp-includes/version.php b/wp-includes/version.php index b44c4ba3a5..947f812d91 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.