Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Dion Hulse 2016-08-27 15:13:33 +00:00
parent 71e8e8368a
commit ec83ce1a0c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/load.php
View File

@ -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;
}
}

2
wp-includes/version.php
View File

@ -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.