From ec83ce1a0ce50ac5e277bb777d3cf00abdab1f91 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 27 Aug 2016 15:13:33 +0000 Subject: [PATCH] i18n: Retire another remaining `wp-includes/locale.php` require, and instead load the required `WP_Locale` class directly. See #37827. Built from https://develop.svn.wordpress.org/trunk@38404 git-svn-id: http://core.svn.wordpress.org/trunk@38345 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index cd667734b4..8e1f351115 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -867,7 +867,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 . '/locale.php'; + require_once ABSPATH . WPINC . '/class-wp-locale.php'; // General libraries require_once ABSPATH . WPINC . '/plugin.php'; @@ -1077,4 +1077,4 @@ function is_wp_error( $thing ) { function get_current_site() { global $current_site; return $current_site; -} \ No newline at end of file +} diff --git a/wp-includes/version.php b/wp-includes/version.php index 4d8fdcfac3..30a505aef9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38403'; +$wp_version = '4.7-alpha-38404'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.