From eaab2c9092255a681231e85cb779f48269f2de65 Mon Sep 17 00:00:00 2001 From: Jonny Harris Date: Wed, 28 Jun 2023 17:12:46 +0000 Subject: [PATCH] Themes: Use improved support for child themes in `wp_theme_has_theme_json()`. 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. git-svn-id: https://develop.svn.wordpress.org/trunk@56094 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/global-styles-and-settings.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php index d43bf347fa..a921feee07 100644 --- a/src/wp-includes/global-styles-and-settings.php +++ b/src/wp-includes/global-styles-and-settings.php @@ -407,21 +407,20 @@ function wp_theme_has_theme_json() { 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 - if ( file_exists( get_stylesheet_directory() . '/theme.json' ) ) { - $path = get_stylesheet_directory() . '/theme.json'; + if ( $stylesheet_directory !== $template_directory && file_exists( $stylesheet_directory . '/theme.json' ) ) { + $path = $stylesheet_directory . '/theme.json'; } else { - $path = get_template_directory() . '/theme.json'; + $path = $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; - } + $theme_has_support = file_exists( $path ); return $theme_has_support; }