From e9004a5b483097c5a62d25557ca75498fb7c0acf Mon Sep 17 00:00:00 2001
From: spacedmonkey <spacedmonkey@git.wordpress.org>
Date: Wed, 28 Jun 2023 17:14:27 +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.
Built from https://develop.svn.wordpress.org/trunk@56094


git-svn-id: http://core.svn.wordpress.org/trunk@55606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/global-styles-and-settings.php | 15 +++++++--------
 wp-includes/version.php                    |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/wp-includes/global-styles-and-settings.php b/wp-includes/global-styles-and-settings.php
index d43bf347fa..a921feee07 100644
--- a/wp-includes/global-styles-and-settings.php
+++ b/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;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ff6eec73c8..7864482b57 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @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.