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

Fix the parameter description syntax in the hook docs for the `wp_get_nav_menu_object` filter, added in 4.3. 

See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-07-13 21:45:24 +00:00
parent 6639c342a5
commit 4e74b792fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/nav-menu.php
View File

@ -38,8 +38,8 @@ function wp_get_nav_menu_object( $menu ) {
* *
* @since 4.3.0 * @since 4.3.0
* *
* @param object|false $menu_obj Term from nav_menu taxonomy, or false if nothing had been found. * @param object|false $menu_obj Term from nav_menu taxonomy, or false if nothing had been found.
* @param string $menu The menu ID, slug, or name passed to wp_get_nav_menu_object(). * @param string $menu The menu ID, slug, or name passed to wp_get_nav_menu_object().
*/ */
return apply_filters( 'wp_get_nav_menu_object', $menu_obj, $menu ); return apply_filters( 'wp_get_nav_menu_object', $menu_obj, $menu );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33231'; $wp_version = '4.3-beta2-33232';
/** /**
* 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.