From 4e74b792fa25906bf0fcdc93346408bee3aba26c Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 13 Jul 2015 21:45:24 +0000 Subject: [PATCH] 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 --- wp-includes/nav-menu.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index d255859190..16213f1ce5 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -38,8 +38,8 @@ function wp_get_nav_menu_object( $menu ) { * * @since 4.3.0 * - * @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 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(). */ return apply_filters( 'wp_get_nav_menu_object', $menu_obj, $menu ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index e42e5e201d..ada0cb9607 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.