From 4d4f78ae97ea3c1fff71136dc5753d268ca60ab4 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 1 Sep 2016 12:35:37 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@38496 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-settings.php b/src/wp-settings.php index 111447d4ca..80f556c334 100644 --- a/src/wp-settings.php +++ b/src/wp-settings.php @@ -130,6 +130,7 @@ if ( SHORTINIT ) // 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. wp_not_installed(); @@ -216,7 +217,6 @@ require( ABSPATH . WPINC . '/rest-api.php' ); require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' ); 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();