From 1a8bd3bf07f68ffce7bb7a1824d2b0bc4518ad98 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@git.wordpress.org>
Date: Mon, 11 May 2015 13:10:19 +0000
Subject: [PATCH] In category dropdown, 'selected' should match against
 'value_field'.

Props tlexcellent.
Fixes #32330.

git-svn-id: https://develop.svn.wordpress.org/trunk@32484 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/category-template.php | 10 ++++++----
 tests/phpunit/tests/category.php      | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/category-template.php b/src/wp-includes/category-template.php
index 5fb7485332..60748aab69 100644
--- a/src/wp-includes/category-template.php
+++ b/src/wp-includes/category-template.php
@@ -1165,13 +1165,15 @@ class Walker_CategoryDropdown extends Walker {
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters( 'list_cats', $category->name, $category );
 
-		if ( ! isset( $args['value_field'] ) || ! isset( $category->{$args['value_field']} ) ) {
-			$args['value_field'] = 'term_id';
+		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->{$args['value_field']} ) . "\"";
+		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
 
-		if ( $category->term_id == $args['selected'] )
+		if ( $category->{$value_field} == $args['selected'] )
 			$output .= ' selected="selected"';
 		$output .= '>';
 		$output .= $pad.$cat_name;
diff --git a/tests/phpunit/tests/category.php b/tests/phpunit/tests/category.php
index eed89e4a54..b23be34edd 100644
--- a/tests/phpunit/tests/category.php
+++ b/tests/phpunit/tests/category.php
@@ -327,4 +327,28 @@ class Tests_Category extends WP_UnitTestCase {
 		// Test to see if it returns the default with the category slug.
 		$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 );
+	}
 }