Ticket #13006: wp_nav_menu_bail.diff

wp-includes/nav-menu-template.php

@@ -220 +220 @@
                 }
         }
 
+        // If no fallback function was specified and the menu doesn't exists, bail.
+        if ( !$menu || is_wp_error($menu) )
+                return false;
+        
         $nav_menu = '';
         $items = '';
         $container_allowedtags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'p', 'nav' ) );
-
+        
         if ( in_array( $args->container, $container_allowedtags ) ) {
                 $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : ' class="menu-'. $menu->slug .'-container"';
                 $nav_menu .= '<'. $args->container . $class .'>';