Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/l10n.php
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@ function wp_dropdown_languages( $args = array() ) {
$structure[] = sprintf(
'<option value="%s" lang="en" data-installed="1"%s>English (United States)</option>',
esc_attr( $value ),
selected( '', $parsed_args['selected'], false )
selected( $value, $parsed_args['selected'], false )
);
}

Expand Down
24 changes: 24 additions & 0 deletions tests/phpunit/tests/l10n.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,30 @@ public function test_wp_dropdown_languages_en_US_selected() {
$this->assertStringContainsString( '<option value="ja_JP" lang="ja">日本語</option>', $actual );
}

/**
* @ticket 58284
*
* @covers ::wp_dropdown_languages
*/
public function test_wp_dropdown_languages_explicit_option_en_us_selected() {
$args = array(
'id' => 'test_explicit_en_us',
'name' => 'test_explicit_en_us',
'languages' => array( 'de_DE' ),
'translations' => $this->wp_dropdown_languages_filter(),
'selected' => 'en_US',
'explicit_option_en_us' => true,
'echo' => false,
);
$actual = wp_dropdown_languages( $args );

$this->assertStringContainsString(
'value="en_US" lang="en" data-installed="1" selected=\'selected\'',
$actual,
'en_US should be selected when explicit_option_en_us is true and selected is en_US'
);
}

/**
* Add site default language to ja_JP in dropdown
*
Expand Down
Loading