Changeset 32748 for trunk/src/wp-includes/nav-menu.php

Timestamp:

06/13/2015 02:37:25 PM (11 years ago)

Author:

ocean90

Message:

Nav menus: Apply the wp_get_nav_menu_items filter also on an empty list of menu items.

props westonruter.
fixes #32631.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (4 diffs)

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

@@ -561 +561 @@
         $menu = wp_get_nav_menu_object( $menu );
 
-        if ( ! $menu )
+        if ( ! $menu ) {
                 return false;
+        }
 
         static $fetched = array();
 
         $items = get_objects_in_term( $menu->term_id, 'nav_menu' );
-
-        if ( empty( $items ) )
-                return $items;
+        if ( is_wp_error( $items ) ) {
+                return false;
+        }
 
         $defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item',
@@ -576 +577 @@
         $args['include'] = $items;
 
-        $items = get_posts( $args );
-
-        if ( is_wp_error( $items ) || ! is_array( $items ) )
-                return false;
+        if ( ! empty( $items ) ) {
+                $items = get_posts( $args );
+        } else {
+                $items = array();
+        }
 
         // Get all posts and terms at once to prime the caches
@@ -617 +619 @@
         $items = array_map( 'wp_setup_nav_menu_item', $items );
 
-        if ( ! is_admin() ) // Remove invalid items only in frontend
+        if ( ! is_admin() ) { // Remove invalid items only in frontend
                 $items = array_filter( $items, '_is_valid_nav_menu_item' );
+        }
 
         if ( ARRAY_A == $args['output'] ) {
@@ -638 +641 @@
          * @param array  $args  An array of arguments used to retrieve menu item objects.
          */
-        return apply_filters( 'wp_get_nav_menu_items',  $items, $menu, $args );
+        return apply_filters( 'wp_get_nav_menu_items', $items, $menu, $args );
 }