diff --git a/wp-includes/load.php b/wp-includes/load.php index bb0db65b94..3cf4b0d207 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -1321,10 +1321,11 @@ function get_current_network_id() { * @since 3.4.0 * @access private * + * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry. * @global WP_Locale $wp_locale WordPress date and time locale object. */ function wp_load_translations_early() { - global $wp_locale; + global $wp_locale, $wp_textdomain_registry; static $loaded = false; if ( $loaded ) { @@ -1342,6 +1343,7 @@ function wp_load_translations_early() { // Translation and localization. require_once ABSPATH . WPINC . '/pomo/mo.php'; require_once ABSPATH . WPINC . '/l10n.php'; + require_once ABSPATH . WPINC . '/class-wp-textdomain-registry.php'; require_once ABSPATH . WPINC . '/class-wp-locale.php'; require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php'; @@ -1351,6 +1353,10 @@ function wp_load_translations_early() { $locales = array(); $locations = array(); + if ( ! $wp_textdomain_registry instanceof WP_Textdomain_Registry ) { + $wp_textdomain_registry = new WP_Textdomain_Registry(); + } + while ( true ) { if ( defined( 'WPLANG' ) ) { if ( '' === WPLANG ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 8dac7f0b9a..f6aa7808a3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1.1-alpha-54805'; +$wp_version = '6.1.1-alpha-54806'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.