WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Pascal Birchler 2016-09-28 08:41:29 +00:00
parent 0d01992968
commit cfa32db674
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/functions.php
View File

@ -3403,8 +3403,9 @@ function smilies_init() {
* to be merged into another array. * to be merged into another array.
* *
* @since 2.2.0 * @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 string|array|object $args Value to merge with $defaults.
* @param array $defaults Optional. Array that serves as the defaults. Default empty. * @param array $defaults Optional. Array that serves as the defaults. Default empty.
* @return array Merged user defined values with defaults. * @return array Merged user defined values with defaults.
*/ */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.