WordPress.org

Make WordPress Core

Changeset 38496


Ignore:
Timestamp:
09/01/2016 12:35:37 PM (3 years ago)
Author:
pento
Message:

Bootstrap: class-wp-locale.php needs to be require_once()-ed.

After [38364], the inclusion of class-wp-locale.php was changed from a require_once() to a require(). This caused problems for anything that called load_text_domain_early() prior to the require() but didn't bail, as it was now being require()-ed a second time.

With the use of require_once(), it doesn't really matter where it's loaded, so it has been moved next to the related l10n.php load.

See #37827.

File:
1 edited

Legend:

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

    r38470 r38496  
    131131// Load the L10n library.
    132132require_once( ABSPATH . WPINC . '/l10n.php' );
     133require_once( ABSPATH . WPINC . '/class-wp-locale.php' );
    133134
    134135// Run the installer if WordPress is not installed.
     
    217218require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
    218219require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' );
    219 require( ABSPATH . WPINC . '/class-wp-locale.php' );
    220220
    221221$GLOBALS['wp_embed'] = new WP_Embed();
Note: See TracChangeset for help on using the changeset viewer.