Changeset 32484

Timestamp:

05/11/2015 01:10:19 PM (11 years ago)

Author:

boonebgorges

Message:

In category dropdown, 'selected' should match against 'value_field'.

Props tlexcellent.
Fixes #32330.

Location:

trunk

Files:

• src/wp-includes/category-template.php (modified) (1 diff)
• tests/phpunit/tests/category.php (modified) (1 diff)

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

@@ -1166 +1166 @@
                 $cat_name = apply_filters( 'list_cats', $category->name, $category );
 
-                if ( ! isset( $args['value_field'] ) || ! isset( $category->{$args['value_field']} ) ) {
-                        $args['value_field'] = 'term_id';
-                }
-
-                $output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$args['value_field']} ) . "\"";
-
-                if ( $category->term_id == $args['selected'] )
+                if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) {
+                        $value_field = $args['value_field'];
+                } else {
+                        $value_field = 'term_id';
+                }
+
+                $output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
+
+                if ( $category->{$value_field} == $args['selected'] )
                         $output .= ' selected="selected"';
                 $output .= '>';

trunk/tests/phpunit/tests/category.php

@@ -328 +328 @@
                 $this->assertContains( 'value="' . $cat_id . '"', $found );
         }
+
+        /**
+         * @ticket 32330
+         */
+        public function test_wp_dropdown_categories_selected_should_respect_custom_value_field() {
+                $c1 = $this->factory->category->create( array(
+                        'name' => 'Test Category 1',
+                        'slug' => 'test_category_1',
+                ) );
+
+                $c2 = $this->factory->category->create( array(
+                        'name' => 'Test Category 2',
+                        'slug' => 'test_category_2',
+                ) );
+
+                $found = wp_dropdown_categories( array(
+                        'echo' => 0,
+                        'hide_empty' => 0,
+                        'value_field' => 'slug',
+                        'selected' => 'test_category_2',
+                ) );
+
+                $this->assertContains( "value=\"test_category_2\" selected=\"selected\"", $found );
+        }
 }