From cfa32db674b3ecf163ae56e62da919bb7e978a6d Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Wed, 28 Sep 2016 08:41:29 +0000
Subject: [PATCH] Docs: Improve parameter description for `wp_parse_args()`.

Props dimadin for initial patch.
Fixes #38167.
Built from https://develop.svn.wordpress.org/trunk@38670


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 48de7e20e1..5b3b1241a9 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3403,9 +3403,10 @@ function smilies_init() {
  * to be merged into another array.
  *
  * @since 2.2.0
+ * @since 2.3.0 `$args` can now also be an object.
  *
- * @param string|array $args     Value to merge with $defaults
- * @param array        $defaults Optional. Array that serves as the defaults. Default empty.
+ * @param string|array|object $args     Value to merge with $defaults.
+ * @param array               $defaults Optional. Array that serves as the defaults. Default empty.
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 528cd6884c..2a048eea7a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38669';
+$wp_version = '4.7-alpha-38670';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.