From f46ce5e7bc7f8ea4d9f090e3a43754afd1100e18 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 9 Jun 2010 22:05:27 +0000 Subject: [PATCH] Allow assigning an empty menu to a location. fixes #13787 git-svn-id: http://svn.automattic.com/wordpress/trunk@15184 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 8889c50c6d..616c29475a 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -162,8 +162,8 @@ function wp_nav_menu( $args = array() ) { if ( $menu && ! is_wp_error($menu) && !isset($menu_items) ) $menu_items = wp_get_nav_menu_items( $menu->term_id ); - // If no menu was found or if the menu has no items, call the fallback_cb if it exists - if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) + // If no menu was found or if the menu has no items and no location was requested, call the fallback_cb if it exists + if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) ) && ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) ) return call_user_func( $args->fallback_cb, (array) $args );