diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php index c758641ad6f0..18594fde6897 100644 --- a/wp-admin/load-styles.php +++ b/wp-admin/load-styles.php @@ -13,8 +13,11 @@ } 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'; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 349fde5c3b36..8eaa817d3ac8 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -34,14 +34,6 @@ /** 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'; -} - /** * Registers TinyMCE scripts. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 05193eb14663..f80aeb865f35 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-51055'; +$wp_version = '5.8-alpha-51056'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 75fa9e5881f0..99e77f386880 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -171,6 +171,7 @@ require ABSPATH . WPINC . '/theme.php'; 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'; require ABSPATH . WPINC . '/block-template.php';