From d8f67f4340c842366b7d3f88d46c1c14c8418c94 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 4 Apr 2015 14:13:27 +0000
Subject: [PATCH] Fix Docblock syntax for the `taxonomy_parent_dropdown_args`
 filter.

See [30998]. See #31888

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


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

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index af6872d94c..a75d7de46b 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -482,7 +482,7 @@ do_action( "{$taxonomy}_term_new_form_tag" );
 	 * Filter the taxonomy parent drop-down on the Edit Term page.
 	 *
 	 * @since 3.7.0
-	 * @since 4.2.0 Added $context parameter.
+	 * @since 4.2.0 Added `$context` parameter.
 	 *
 	 * @param array  $dropdown_args {
 	 *     An array of taxonomy parent drop-down arguments.
@@ -500,6 +500,7 @@ do_action( "{$taxonomy}_term_new_form_tag" );
 	 * @param string $context  Filter context. Accepts 'new' or 'edit'.
 	 */
 	$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+
 	wp_dropdown_categories( $dropdown_args );
 	?>
 	<?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3a713c72fa..39450e6a61 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32002';
+$wp_version = '4.2-beta4-32003';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.