mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-21 12:29:53 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@51056 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2021-06-01 23:08:29 +00:00
parent 052550fca4
commit 6857f8449c
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-admin/load-styles.php
View File

@ -13,8 +13,11 @@ if ( ! defined( 'ABSPATH' ) ) {
}
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';

8
src/wp-includes/script-loader.php
View File

@ -34,14 +34,6 @@ require ABSPATH . WPINC . '/class.wp-styles.php';
/** 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.
*

1
src/wp-settings.php
View File

@ -171,6 +171,7 @@ 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-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';