Wordpress 3.2.1

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

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 03032750c6d4f9b7b880750a7f3a659f7a64c66f..467d73e18f849ee537ab2581ef763df8e8deac3e 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' );
+                               if ( is_wp_error( $original_title ) )
+                                       $original_title = false;
                                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
                        } else {