Changeset 51056

Timestamp:

06/01/2021 11:08:29 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Block Editor: Load the WP_Theme_JSON_Resolver class in wp-admin/load-styles.php.

This ensures correct load order when style concatenation is used, e.g. when SCRIPT_DEBUG is off.

Additionally, make sure the WP_CONTENT_DIR constant is defined for use in get_theme_root() via get_stylesheet_directory().

Follow-up to [50992], [51001], [51013].

Props nosolosw.
See #53175.

Location:

trunk/src

Files:

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

trunk/src/wp-admin/load-styles.php

@@ -14 +14 @@
 
 define( 'WPINC', 'wp-includes' );
+define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
 
 require ABSPATH . 'wp-admin/includes/noop.php';
+require ABSPATH . WPINC . '/theme.php';
+require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/script-loader.php';
 require ABSPATH . WPINC . '/version.php';

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

@@ -34 +34 @@
 /** WordPress Styles Functions */
 require ABSPATH . WPINC . '/functions.wp-styles.php';
-
-// get_stylesheet_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

@@ -172 +172 @@
 require ABSPATH . WPINC . '/class-wp-theme.php';
 require ABSPATH . WPINC . '/class-wp-theme-json.php';
+require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/class-wp-block-template.php';
 require ABSPATH . WPINC . '/block-template-utils.php';