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
4 changes: 2 additions & 2 deletions src/wp-includes/post-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -1230,10 +1230,10 @@ function wp_dropdown_pages( $args = '' ) {

$output = "<select name='" . esc_attr( $parsed_args['name'] ) . "'" . $class . " id='" . esc_attr( $parsed_args['id'] ) . "'>\n";
if ( $parsed_args['show_option_no_change'] ) {
$output .= "\t<option value=\"-1\">" . $parsed_args['show_option_no_change'] . "</option>\n";
$output .= "\t<option value=\"-1\"" . selected( '-1', $parsed_args['selected'], false ) . '>' . $parsed_args['show_option_no_change'] . "</option>\n";
}
if ( $parsed_args['show_option_none'] ) {
$output .= "\t<option value=\"" . esc_attr( $parsed_args['option_none_value'] ) . '">' . $parsed_args['show_option_none'] . "</option>\n";
$output .= "\t<option value=\"" . esc_attr( $parsed_args['option_none_value'] ) . '"' . selected( $parsed_args['option_none_value'], $parsed_args['selected'], false ) . '>' . $parsed_args['show_option_none'] . "</option>\n";
}
$output .= walk_page_dropdown_tree( $pages, $parsed_args['depth'], $parsed_args );
$output .= "</select>\n";
Expand Down
49 changes: 49 additions & 0 deletions tests/phpunit/tests/post/wpDropdownPages.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,53 @@ public function test_wp_dropdown_pages_should_obey_class_parameter() {

$this->assertMatchesRegularExpression( '/<select[^>]+class=\'bar\'/', $found );
}

/**
* Tests that the 'show_option_none' option can be selected.
*
* @ticket 65510
*/
public function test_wp_dropdown_pages_show_option_none_is_selected() {
self::factory()->post->create(
array(
'post_type' => 'page',
'post_name' => 'foo',
)
);

$found = wp_dropdown_pages(
array(
'echo' => 0,
'show_option_none' => 'None',
'option_none_value' => 'none_value',
'selected' => 'none_value',
)
);

$this->assertStringContainsString( '<option value="none_value" selected=\'selected\'>None</option>', $found );
}

/**
* Tests that the 'show_option_no_change' option can be selected.
*
* @ticket 65510
*/
public function test_wp_dropdown_pages_show_option_no_change_is_selected() {
self::factory()->post->create(
array(
'post_type' => 'page',
'post_name' => 'foo',
)
);

$found = wp_dropdown_pages(
array(
'echo' => 0,
'show_option_no_change' => 'No Change',
'selected' => '-1',
)
);

$this->assertStringContainsString( '<option value="-1" selected=\'selected\'>No Change</option>', $found );
}
}
Loading