Wordpress 3.3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / nav-menu.php

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index e1af8f7aaecdcee48a84b530d9112c7da110b12c..6a622b27aa21e103ba39d1a1b521014936086eff 100644 (file)
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -442,6 +442,22 @@ function _sort_nav_menu_items( $a, $b ) {
                return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
 }
 
+/**
+ * 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,6 +529,9 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 
        $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'] ) {
                $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
                usort($items, '_sort_nav_menu_items');
@@ -560,7 +579,13 @@ function wp_setup_nav_menu_item( $menu_item ) {
 
                        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 );
 
                                $original_object = get_post( $menu_item->object_id );
@@ -569,11 +594,19 @@ function wp_setup_nav_menu_item( $menu_item ) {
 
                        } 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 : '';
 
                                $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
+                               if ( is_wp_error( $original_title ) )
+                                       $original_title = false;
                                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
                        } else {
@@ -585,7 +618,9 @@ function wp_setup_nav_menu_item( $menu_item ) {
                        $menu_item->target = empty( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
 
                        $menu_item->attr_title = empty( $menu_item->attr_title ) ? apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt ) : $menu_item->attr_title;
-                       $menu_item->description = empty( $menu_item->description ) ? apply_filters( 'nav_menu_description', $menu_item->post_content ) : $menu_item->description;
+
+                       if ( empty( $menu_item->description ) )
+                               $menu_item->description = apply_filters( 'nav_menu_description',  wp_trim_words( $menu_item->post_content, 200 ) );
 
                        $menu_item->classes = empty( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes;
                        $menu_item->xfn = empty( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
@@ -603,8 +638,8 @@ function wp_setup_nav_menu_item( $menu_item ) {
                        $menu_item->url = get_permalink( $menu_item->ID );
                        $menu_item->target = '';
 
-                       $menu_item->attr_title = apply_filters( 'nav_menu_attr_title', $menu_item->post_excerpt );
-                       $menu_item->description = apply_filters( 'nav_menu_description', $menu_item->post_content );
+                       $menu_item->attr_title = apply_filters( 'nav_menu_attr_title', '' );
+                       $menu_item->description = apply_filters( 'nav_menu_description', '' );
                        $menu_item->classes = array();
                        $menu_item->xfn = '';
                }