Changeset 42221

Timestamp:

11/23/2017 07:05:42 PM (7 years ago)

Author:

johnbillion

Message:

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

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.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (1 diff)

branches/4.9/src/wp-includes/general-template.php

@@ -704 +704 @@
             $output = __( 'html_lang_attribute' );
             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 );
             }