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 03032750c6d4f9b7b880750a7f3a659f7a64c66f..6a622b27aa21e103ba39d1a1b521014936086eff 100644 (file)
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -605,6 +605,8 @@ function wp_setup_nav_menu_item( $menu_item ) {
                                $menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';
 
                                $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
                                $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 {
                                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
                        } else {


@@ -616,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->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;
 
                        $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;


@@ -634,8 +638,8 @@ function wp_setup_nav_menu_item( $menu_item ) {
                        $menu_item->url = get_permalink( $menu_item->ID );
                        $menu_item->target = '';
 
                        $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 = '';
                }
                        $menu_item->classes = array();
                        $menu_item->xfn = '';
                }