Changes in trunk/wp-includes/nav-menu.php [15788:18277]

File:

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

trunk/wp-includes/nav-menu.php

@@ -444 +444 @@
 
 /**
+ * Returns if a menu item is valid. Bug #13958
+ *
+ * @since 3.2.0
+ * @access private
+ *
+ * @param object $menu_item The menu item to check
+ * @return bool false if invalid, else true.
+ */
+function _is_valid_nav_menu_item( $item ) {
+    if ( ! empty( $item->_invalid ) )
+        return false;
+
+    return true;
+}
+
+/**
  * Returns all menu items of a navigation menu.
  *
@@ -513 +529 @@
 
     $items = array_map( 'wp_setup_nav_menu_item', $items );
+
+    if ( ! is_admin() ) // Remove invalid items only in frontend
+        $items = array_filter( $items, '_is_valid_nav_menu_item' );
 
     if ( ARRAY_A == $args['output'] ) {
@@ -561 +580 @@
             if ( 'post_type' == $menu_item->type ) {
                 $object = get_post_type_object( $menu_item->object );
-                $menu_item->type_label = $object->labels->singular_name;
+                if ( $object ) {
+                    $menu_item->type_label = $object->labels->singular_name;
+                } else {
+                    $menu_item->type_label = $menu_item->object;
+                    $menu_item->_invalid = true;
+                }
+
                 $menu_item->url = get_permalink( $menu_item->object_id );
 
@@ -570 +595 @@
             } elseif ( 'taxonomy' == $menu_item->type ) {
                 $object = get_taxonomy( $menu_item->object );
-                $menu_item->type_label = $object->labels->singular_name;
+                if ( $object ) {
+                    $menu_item->type_label = $object->labels->singular_name;
+                } else {
+                    $menu_item->type_label = $menu_item->object;
+                    $menu_item->_invalid = true;
+                }
+
                 $term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
                 $menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';