From d878213e5552c3fd2a07891370a6a9609d456c21 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Tue, 16 Jun 2015 20:33:00 +0000
Subject: [PATCH] In `wp_nav_menu()`, ensure that the `$menu` arg is populated
 when passed to filters.

Props greuben, chriscct7.
Fixes #16594.


git-svn-id: https://develop.svn.wordpress.org/trunk@32803 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/nav-menu-template.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/nav-menu-template.php b/src/wp-includes/nav-menu-template.php
index 4194c506d4..2bd37a106d 100644
--- a/src/wp-includes/nav-menu-template.php
+++ b/src/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 ) );