vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I18N: Ensure determine_locale() does not potentially return an empty string.

Browse Source 
Call `get_locale()` as a last resort in case the sanitized locale is an empty string.

Also swaps conditionals to cater for more typical use case and adds tests.

Follow-up to [55862]

Props Cybr, swissspidy.
Fixes #58317.

git-svn-id: https://develop.svn.wordpress.org/trunk@56003 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2023-06-23 16:01:08 +00:00
parent 44e89612d0
commit 85e6518189
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/l10n.php
View File

@ -145,12 +145,14 @@ function determine_locale() {
} else {
$determined_locale = sanitize_locale_name( $_COOKIE['wp_lang'] );
}
} else if (
( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) ||
is_admin()
} elseif (
is_admin() ||
( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() )
) {
$determined_locale = get_user_locale();
} else {
}
if ( ! $determined_locale ) {
$determined_locale = get_locale();
}

16
tests/phpunit/tests/l10n/determineLocale.php
View File

@ -211,6 +211,22 @@ class Tests_L10n_DetermineLocale extends WP_UnitTestCase {
$this->assertSame( 'siteLocale', determine_locale() );
}
public function test_wp_login_get_param_on_login_page_incorrect_string() {
add_filter(
'locale',
static function() {
return 'siteLocale';
}
);
wp_set_current_user( self::$user_id );
$GLOBALS['pagenow'] = 'wp-login.php';
$_GET['wp_lang'] = '###'; // Something sanitize_locale_name() strips away.
$this->assertSame( 'siteLocale', determine_locale() );
}
public function test_wp_login_cookie_not_on_login_page() {
add_filter(
'locale',