Changeset 56094 for trunk/src/wp-includes/global-styles-and-settings.php

Timestamp:

06/28/2023 05:12:46 PM (19 months ago)

Author:

spacedmonkey

Message:

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.

File:

• trunk/src/wp-includes/global-styles-and-settings.php (modified) (2 diffs)

trunk/src/wp-includes/global-styles-and-settings.php

@@ -408 +408 @@
     }
 
+    $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';
     }
 
@@ -418 +421 @@
     $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;