From e56457f7fed06eafd1cc096d633b0e65c5ef3e03 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 13 Jan 2016 20:16:29 +0000
Subject: [PATCH] Taxonomy: Correct the accetped types for the `taxonomy`
 element in the arguments passed to `wp_dropdown_categories()`.

Props grapplerulrich
Fixes #35446

Built from https://develop.svn.wordpress.org/trunk@36289


git-svn-id: http://core.svn.wordpress.org/trunk@36256 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/category-template.php | 2 +-
 wp-includes/version.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index b1006dd2db..35d6c82ed0 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -348,7 +348,7 @@ function category_description( $category = 0 ) {
  *                                           of the option elements. Accepts any valid term field: 'term_id', 'name',
  *                                           'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description',
  *                                           'parent', 'count'. Default 'term_id'.
- *     @type string       $taxonomy          Name of the category to retrieve. Default 'category'.
+ *     @type string|array $taxonomy          Name of the category or categories to retrieve. Default 'category'.
  *     @type bool         $hide_if_empty     True to skip generating markup if no categories are found.
  *                                           Default false (create select element even if no categories are found).
  * }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 46071dd11e..0d06070c9a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36288';
+$wp_version = '4.5-alpha-36289';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.