Changeset 48880 for trunk

Timestamp:

08/27/2020 02:46:22 AM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

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.

Location:

trunk

Files:

• src/wp-admin/includes/class-walker-category-checklist.php (modified) (1 diff)
• src/wp-admin/includes/template.php (modified) (2 diffs)
• tests/phpunit/tests/admin/includesTemplate.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-walker-category-checklist.php

@@ -82 +82 @@
         }
 
-        $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"' : '';
 
-        $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'] ) ) {

trunk/src/wp-admin/includes/template.php

@@ -121 +121 @@
 
     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 ) {
         $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
@@ -129 +129 @@
 
     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 {
         $args['popular_cats'] = get_terms(

trunk/tests/phpunit/tests/admin/includesTemplate.php

@@ -4 +4 @@
  */
 class Tests_Admin_includesTemplate extends WP_UnitTestCase {
+
     function test_equal() {
         $this->assertEquals( ' selected=\'selected\'', selected( 'foo', 'foo', false ) );
@@ -45 +46 @@
         $this->assertEquals( '', selected( 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 ),
+        );
     }