From d2dc5dd17948dfc140b1fa79ae136d1e880f389c Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 2 Mar 2010 17:56:24 +0000 Subject: [PATCH] Fix is_nav_menu(). Props Utkarsh. see #11817 git-svn-id: https://develop.svn.wordpress.org/trunk@13550 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/nav-menu.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index 27c85ba012..60cce801cc 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -30,17 +30,22 @@ function wp_get_nav_menu_object( $menu ) { * @return mixed Menu Object, if exists. */ function is_nav_menu( $menu ) { - if ( $menu ) { - $menu = get_term( $menu, 'nav_menu' ); - } elseif ( !$menu ) { - $menu = get_term_by( 'slug', $menu, 'nav_menu' ); - } elseif( !$menu ) { - $menu = get_term_by( 'name', $menu, 'nav_menu' ); - } else { - $menu = false; + if ( !$menu ) + return false; + + $menu_obj = get_term( $menu, 'nav_menu' ); + + if ( !$menu_obj ) + $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' ); + + if ( !$menu_obj ) + $menu_obj = get_term_by( 'name', $menu, 'nav_menu' ); + + if ( !$menu_obj ) { + $menu_obj = false; } - - return $menu; + + return $menu_obj; } /**