From 3050d963103ef7699c5e4c1601d970a5f33afe46 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 7 May 2015 20:37:17 +0000
Subject: [PATCH] Ensure the optional parameter in `get_object_taxonomies()` is
 documented as such.

See #32246.

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


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

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index b39c5571ff..bba09b4fd2 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -171,10 +171,11 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
  * @global array $wp_taxonomies The registered taxonomies.
  *
  * @param array|string|object $object Name of the type of taxonomy object, or an object (row from posts)
- * @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
+ * @param string              $output Optional. The type of output to return in the array. Accepts either
+ *                            taxonomy 'names' or 'objects'. Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_object_taxonomies($object, $output = 'names') {
+function get_object_taxonomies( $object, $output = 'names' ) {
 	global $wp_taxonomies;
 
 	if ( is_object($object) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d064466a4c..8bf557aa28 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32451';
+$wp_version = '4.3-alpha-32452';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.