From f6af848c723bda7b62757b49e2821affd8be6961 Mon Sep 17 00:00:00 2001
From: youknowriad <youknowriad@git.wordpress.org>
Date: Tue, 25 May 2021 13:42:58 +0000
Subject: [PATCH] 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.

Built from https://develop.svn.wordpress.org/trunk@51001


git-svn-id: http://core.svn.wordpress.org/trunk@50610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/script-loader.php | 11 +++++++++++
 wp-includes/version.php       |  2 +-
 wp-settings.php               |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f82f08d29e..8a77a441b3 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -34,6 +34,17 @@ require ABSPATH . WPINC . '/class.wp-styles.php';
 /** 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';
+}
+
 /**
  * Registers TinyMCE scripts.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 628311e769..882ec44bb1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-51000';
+$wp_version = '5.8-alpha-51001';
 
 /**
  * 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 770fa9ff3d..47dad42e20 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -299,7 +299,7 @@ require ABSPATH . WPINC . '/class-wp-block-parser.php';
 require ABSPATH . WPINC . '/blocks.php';
 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';
 require ABSPATH . WPINC . '/class-wp-block-supports.php';