Changeset 56185

Timestamp:

07/10/2023 07:15:36 PM (15 months ago)

Author:

spacedmonkey

Message:

Themes: Improved caching in wp_theme_has_theme_json().

Improve logic in wp_theme_has_theme_json() to improve caching soo it takes into account that a theme can be switched. Before this function would overly cache if the current theme has a theme.json file. Now it use the value of get_stylesheet() as a key to an array. This way, if the value of stylesheet is changed, by either a filter or in a unit test, a new check to see if the file exists is run. For this reason, the workaround to check if unit tests are running by checking if WP_RUN_CORE_TESTS constant exists can be removed.

Props westonruter, spacedmonkey, flixos90.
Fixes #58758.

File:

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

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

@@ -351 +351 @@
  */
 function wp_theme_has_theme_json() {
-    static $theme_has_support = null;
+    static $theme_has_support = array();
+
+    $stylesheet = get_stylesheet();
 
     if (
-        null !== $theme_has_support &&
+        isset( $theme_has_support[ $stylesheet ] ) &&
         /*
          * Ignore static cache when the development mode is set to 'theme', to avoid interfering with
          * the theme developer's workflow.
          */
-        wp_get_development_mode() !== 'theme' &&
-        /*
-         * Ignore cache when automated test suites are running. Why? To ensure
-         * the static cache is reset between each test.
-         */
-        ! ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS )
+        wp_get_development_mode() !== 'theme'
     ) {
-        return $theme_has_support;
+        return $theme_has_support[ $stylesheet ];
     }
 
@@ -382 +379 @@
     $path = apply_filters( 'theme_file_path', $path, 'theme.json' );
 
-    $theme_has_support = file_exists( $path );
-
-    return $theme_has_support;
+    $theme_has_support[ $stylesheet ] = file_exists( $path );
+
+    return $theme_has_support[ $stylesheet ];
 }