Changeset 13550

Timestamp:

03/02/2010 05:56:24 PM (17 years ago)

Author:

ryan

Message:

Fix is_nav_menu(). Props Utkarsh. see #11817

File:

• trunk/wp-includes/nav-menu.php (modified) (1 diff)

trunk/wp-includes/nav-menu.php

@@ -31 +31 @@
  */
 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;
-        }
-                
-        return $menu;
+        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_obj;
 }