Ticket #24035: 24035.diff

wp-includes/nav-menu-template.php

@@ -189 +189 @@
                 && $args->fallback_cb && is_callable( $args->fallback_cb ) )
                         return call_user_func( $args->fallback_cb, (array) $args );
 
-        if ( !$menu || is_wp_error( $menu ) || empty( $menu_items ) )
+        if ( ! $menu || is_wp_error( $menu ) )
                 return false;
 
         $nav_menu = $items = '';
@@ -239 +239 @@
         $items = apply_filters( 'wp_nav_menu_items', $items, $args );
         $items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
 
+        // Bail if there are no items
+        if ( empty( $items ) )
+                return false;
+
         $nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
         unset( $items );