Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-17 13:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Users: Correct the value of the lang attribute in the admin area.

Browse Source 
This corrects the value when the user's language is set to `English (United States)` but the site language is not.

Props ocean90, afercia

Fixes #42242

Merges [42220] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42221


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-11-23 19:06:42 +00:00
parent 97ba6be232
commit 4cb8d10856
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/general-template.php
View File

@ -703,7 +703,7 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
*/ */
$output = __( 'html_lang_attribute' ); $output = __( 'html_lang_attribute' );
if ( 'html_lang_attribute' === $output || preg_match( '/[^a-zA-Z0-9-]/', $output ) ) { if ( 'html_lang_attribute' === $output || preg_match( '/[^a-zA-Z0-9-]/', $output ) ) {
$output = get_locale(); $output = is_admin() ? get_user_locale() : get_locale();
$output = str_replace( '_', '-', $output ); $output = str_replace( '_', '-', $output );
} }
break; break;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.1-alpha-42219'; $wp_version = '4.9.1-alpha-42221';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.