diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index ba856491af..0ad4e01ba7 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -88,7 +88,7 @@ function get_locale() { */ function get_user_locale( $user_id = 0 ) { $user = false; - if ( 0 === $user_id ) { + if ( 0 === $user_id && function_exists( 'wp_get_current_user' ) ) { $user = wp_get_current_user(); } elseif ( $user_id instanceof WP_User ) { $user = $user_id; @@ -710,7 +710,7 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path * @param string $locale The plugin's current locale. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ - $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); + $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain ); $mofile = $domain . '-' . $locale . '.mo'; @@ -744,7 +744,7 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path */ function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) { /** This filter is documented in wp-includes/l10n.php */ - $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); + $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain ); $mofile = $domain . '-' . $locale . '.mo'; @@ -783,7 +783,7 @@ function load_theme_textdomain( $domain, $path = false ) { * @param string $locale The theme's current locale. * @param string $domain Text domain. Unique identifier for retrieving translated strings. */ - $locale = apply_filters( 'theme_locale', get_locale(), $domain ); + $locale = apply_filters( 'theme_locale', is_admin() ? get_user_locale() : get_locale(), $domain ); $mofile = $domain . '-' . $locale . '.mo'; @@ -865,7 +865,7 @@ function _load_textdomain_just_in_time( $domain ) { } } - $locale = get_locale(); + $locale = is_admin() ? get_user_locale() : get_locale(); $mofile = "{$domain}-{$locale}.mo"; if ( in_array( WP_LANG_DIR . '/plugins/' . $mofile, $cached_mofiles ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5577ada75c..c999eb2d38 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta1-39126'; +$wp_version = '4.7-beta1-39127'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.