Changeset 51001

Timestamp:

05/25/2021 01:41:30 PM (3 years ago)

Author:

youknowriad

Message:

Block Editor: Load theme resolver class in script loader.

script-loader.php is sometimes called directly and in these situations, the Theme_JSON_Resolver class was not defined.

Props nosolosw, noisysocks.
Fixes #53175.

Location:

trunk/src

Files:

• wp-includes/script-loader.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/script-loader.php

@@ -34 +34 @@
 /** WordPress Styles Functions */
 require ABSPATH . WPINC . '/functions.wp-styles.php';
+
+/**
+ * get_stylsheet_directory is used by
+ * WP_Theme_JSON_Resolver::theme_has_support()
+ */
+if ( ! function_exists( 'get_stylesheet_directory' ) ) {
+    require_once ABSPATH . WPINC . '/theme.php';
+}
+if ( ! class_exists( 'WP_Theme_JSON_Resolver' ) ) {
+    require_once ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
+}
 
 /**

trunk/src/wp-settings.php

@@ -300 +300 @@
 require ABSPATH . WPINC . '/blocks/index.php';
 require ABSPATH . WPINC . '/class-wp-theme-json.php';
-require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
+require_once ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/block-editor.php';
 require ABSPATH . WPINC . '/block-patterns.php';