From a2200dda81ea4f645a1b9750b4b9ef62b58a08b3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 25 May 2021 21:39:38 +0000
Subject: [PATCH] Block Editor: Only load the `WP_Theme_JSON_Resolver` class
 once.

Since the class is now loaded via `wp-includes/script-loader.php`, which is required earlier in `wp-settings.php`, loading it again in `wp-settings.php` is redundant.

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

See #53175.

git-svn-id: https://develop.svn.wordpress.org/trunk@51013 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/script-loader.php | 5 +----
 src/wp-settings.php               | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 62936447b9..5706352e36 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -34,10 +34,7 @@ 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()
- */
+// 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';
 }
diff --git a/src/wp-settings.php b/src/wp-settings.php
index 833997460c..48b648e803 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -170,6 +170,7 @@ require ABSPATH . WPINC . '/query.php';
 require ABSPATH . WPINC . '/class-wp-date-query.php';
 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-block-template.php';
 require ABSPATH . WPINC . '/block-template-utils.php';
 require ABSPATH . WPINC . '/block-template.php';
@@ -303,8 +304,6 @@ require ABSPATH . WPINC . '/class-wp-block-list.php';
 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_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';