sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2015-06-16 20:33:00 +00:00
parent a6a0480eb0
commit d878213e55
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 the menu exists, get its items.
if ( $menu && ! is_wp_error($menu) && !isset($menu_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 ) ); $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );