Skip to content

Commit 4d4f78a

Browse files
committed
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
1 parent dc5951f commit 4d4f78a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/wp-settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130

131131
// Load the L10n library.
132132
require_once( ABSPATH . WPINC . '/l10n.php' );
133+
require_once( ABSPATH . WPINC . '/class-wp-locale.php' );
133134

134135
// Run the installer if WordPress is not installed.
135136
wp_not_installed();
@@ -216,7 +217,6 @@
216217
require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' );
217218
require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
218219
require( 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();
222222

0 commit comments

Comments
 (0)