From 4babadb704bade7ea2cddd2b33d56c72fc29b0ba Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 1 Sep 2016 12:36:28 +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. Built from https://develop.svn.wordpress.org/trunk@38496 git-svn-id: http://core.svn.wordpress.org/trunk@38437 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index e580d5db83..7f45f3e687 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38495'; +$wp_version = '4.7-alpha-38496'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 111447d4ca..80f556c334 100644 --- a/wp-settings.php +++ b/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();