sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Taxonomy: Make sure wp_terms_checklist() and Walker_Category_Checklist::start_el() properly handle an array of strings as selected_cats or popular_cats values.

Browse Source 
Even with these values documented as an array of integers, they can technically also accept an array of strings, e.g. as form results.

Add a unit test.

Props brianhogg, TimothyBlynJacobs, SergeyBiryukov.
Fixes #51137.

git-svn-id: https://develop.svn.wordpress.org/trunk@48880 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-08-27 02:46:22 +00:00
parent 3f7add7d99
commit c8b5610b91
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/class-walker-category-checklist.php
View File

@ -81,11 +81,11 @@ class Walker_Category_Checklist extends Walker {
$name = 'tax_input[' . $taxonomy . ']'; $name = 'tax_input[' . $taxonomy . ']';
} }
$args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats']; $args['popular_cats'] = ! empty( $args['popular_cats'] ) ? array_map( 'intval', $args['popular_cats'] ) : array();
$class = in_array( $category->term_id, $args['popular_cats'], true ) ? ' class="popular-category"' : ''; $class = in_array( $category->term_id, $args['popular_cats'], true ) ? ' class="popular-category"' : '';
$args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats']; $args['selected_cats'] = ! empty( $args['selected_cats'] ) ? array_map( 'intval', $args['selected_cats'] ) : array();
if ( ! empty( $args['list_only'] ) ) { if ( ! empty( $args['list_only'] ) ) {
$aria_checked = 'false'; $aria_checked = 'false';

4
src/wp-admin/includes/template.php
View File

@ -120,7 +120,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
$args['list_only'] = ! empty( $parsed_args['list_only'] ); $args['list_only'] = ! empty( $parsed_args['list_only'] );
if ( is_array( $parsed_args['selected_cats'] ) ) { if ( is_array( $parsed_args['selected_cats'] ) ) {
$args['selected_cats'] = $parsed_args['selected_cats']; $args['selected_cats'] = array_map( 'intval', $parsed_args['selected_cats'] );
} elseif ( $post_id ) { } elseif ( $post_id ) {
$args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) ); $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
} else { } else {
@ -128,7 +128,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
} }
if ( is_array( $parsed_args['popular_cats'] ) ) { if ( is_array( $parsed_args['popular_cats'] ) ) {
$args['popular_cats'] = $parsed_args['popular_cats']; $args['popular_cats'] = array_map( 'intval', $parsed_args['popular_cats'] );
} else { } else {
$args['popular_cats'] = get_terms( $args['popular_cats'] = get_terms(
array( array(

40
tests/phpunit/tests/admin/includesTemplate.php
View File

@ -3,6 +3,7 @@
* @group admin * @group admin
*/ */
class Tests_Admin_includesTemplate extends WP_UnitTestCase { class Tests_Admin_includesTemplate extends WP_UnitTestCase {
function test_equal() { function test_equal() {
$this->assertEquals( ' selected=\'selected\'', selected( 'foo', 'foo', false ) ); $this->assertEquals( ' selected=\'selected\'', selected( 'foo', 'foo', false ) );
$this->assertEquals( ' checked=\'checked\'', checked( 'foo', 'foo', false ) ); $this->assertEquals( ' checked=\'checked\'', checked( 'foo', 'foo', false ) );
@ -46,6 +47,45 @@ class Tests_Admin_includesTemplate extends WP_UnitTestCase {
$this->assertEquals( '', checked( 0, false, false ) ); $this->assertEquals( '', checked( 0, false, false ) );
} }
/**
* @ticket 51147
* @dataProvider data_wp_terms_checklist_with_selected_cats
*/
public function test_wp_terms_checklist_with_selected_cats( $term_id ) {
$output = wp_terms_checklist(
0,
array(
'selected_cats' => array( $term_id ),
'echo' => false,
)
);
$this->assertContains( "checked='checked'", $output );
}
/**
* @ticket 51147
* @dataProvider data_wp_terms_checklist_with_selected_cats
*/
public function test_wp_terms_checklist_with_popular_cats( $term_id ) {
$output = wp_terms_checklist(
0,
array(
'popular_cats' => array( $term_id ),
'echo' => false,
)
);
$this->assertContains( 'class="popular-category"', $output );
}
public function data_wp_terms_checklist_with_selected_cats() {
return array(
array( '1' ),
array( 1 ),
);
}
public function test_add_meta_box() { public function test_add_meta_box() {
global $wp_meta_boxes; global $wp_meta_boxes;