Changeset 13354

Timestamp:

02/24/2010 12:37:15 AM (17 years ago)

Author:

wpmuguru

Message:

dont show items when menu empty, See #11817

File:

• trunk/wp-includes/custom-navigation.php (modified) (1 diff)

trunk/wp-includes/custom-navigation.php

@@ -57 +57 @@
         $items = get_objects_in_term( (int) $menu, 'nav_menu' );
 
-        $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
-        $args = wp_parse_args($args, $defaults);
-        if ( count( $items ) > 1 )      
-                $args['include'] = implode( ',', $items );
-        else
-                $args['include'] = $items[0];
-
-        $items = get_posts( $args );
-
-        if ( ARRAY_A == $args['output'] ) {
-                $output = array();
-                foreach ( $items as $item ) {
-                        $output[$item->$args['output_key']] = $item;
-                }
-                unset($items);
-                ksort($output);
-                return $output;
-        } else {
-                return $items;
-        }
+        if ( ! empty( $items ) ) {
+                $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
+                $args = wp_parse_args($args, $defaults);
+                if ( count( $items ) > 1 )      
+                        $args['include'] = implode( ',', $items );
+                else
+                        $args['include'] = $items[0];
+
+                $items = get_posts( $args );
+
+                if ( ARRAY_A == $args['output'] ) {
+                        $output = array();
+                        foreach ( $items as $item ) {
+                                $output[$item->$args['output_key']] = $item;
+                        }
+                        unset($items);
+                        ksort($output);
+                        return $output;
+                }
+        }
+        return $items;
 }