Make WordPress Core


Ignore:
Timestamp:
05/25/2021 09:39:38 PM (4 years ago)
Author:
SergeyBiryukov
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-settings.php

    r51003 r51013  
    171171require ABSPATH . WPINC . '/theme.php';
    172172require ABSPATH . WPINC . '/class-wp-theme.php';
     173require ABSPATH . WPINC . '/class-wp-theme-json.php';
    173174require ABSPATH . WPINC . '/class-wp-block-template.php';
    174175require ABSPATH . WPINC . '/block-template-utils.php';
     
    304305require ABSPATH . WPINC . '/blocks.php';
    305306require ABSPATH . WPINC . '/blocks/index.php';
    306 require ABSPATH . WPINC . '/class-wp-theme-json.php';
    307 require_once ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
    308307require ABSPATH . WPINC . '/block-editor.php';
    309308require ABSPATH . WPINC . '/block-patterns.php';
Note: See TracChangeset for help on using the changeset viewer.