Changeset 38496

Timestamp:

09/01/2016 12:35:37 PM (8 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:

• trunk/src/wp-settings.php (modified) (2 diffs)

trunk/src/wp-settings.php

@@ -131 +131 @@
 // Load the L10n library.
 require_once( ABSPATH . WPINC . '/l10n.php' );
+require_once( ABSPATH . WPINC . '/class-wp-locale.php' );
 
 // Run the installer if WordPress is not installed.
@@ -217 +218 @@
 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' );
-require( ABSPATH . WPINC . '/class-wp-locale.php' );
 
 $GLOBALS['wp_embed'] = new WP_Embed();