From 0cc29d8bb75961b45088251e59538646e2b9db40 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 16 Jun 2015 20:33:25 +0000 Subject: [PATCH] In `wp_nav_menu()`, ensure that the `$menu` arg is populated when passed to filters. Props greuben, chriscct7. Fixes #16594. Built from https://develop.svn.wordpress.org/trunk@32803 git-svn-id: http://core.svn.wordpress.org/trunk@32774 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 4 ++++ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 4194c506d4..2bd37a106d 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -291,6 +291,10 @@ function wp_nav_menu( $args = array() ) { } } + if ( empty( $args->menu ) ) { + $args->menu = $menu; + } + // If the menu exists, get its items. if ( $menu && ! is_wp_error($menu) && !isset($menu_items) ) $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 34cb8e3f03..1873ce6a24 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32802'; +$wp_version = '4.3-alpha-32803'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.