Changeset 24634 for trunk/wp-includes/nav-menu-template.php

Timestamp:

07/10/2013 05:14:43 AM (11 years ago)

Author:

nacin

Message:

If a nav menu has no items, wait until after the wp_nav_menu_items filter before deciding whether to print nothing.

see [21868] for original commit. see #21576.
see #24035 for trunk.

File:

• trunk/wp-includes/nav-menu-template.php (modified) (3 diffs)

trunk/wp-includes/nav-menu-template.php

@@ -180 +180 @@
     /*
      * If no menu was found:
-     *  - Fallback (if one was specified), or bail.
+     *  - Fall back (if one was specified), or bail.
      *
      * If no menu items were found:
-     *  - Fallback, but only if no theme location was specified.
+     *  - Fall back, but only if no theme location was specified.
      *  - Otherwise, bail.
      */
@@ -190 +190 @@
             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;
 
@@ -239 +239 @@
     $items = apply_filters( 'wp_nav_menu_items', $items, $args );
     $items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
+
+    // Don't print any markup if there are no items at this point.
+    if ( empty( $items ) )
+        return false;
 
     $nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );