Changes from trunk/wp-includes/nav-menu.php at r18277 to branches/3.2/wp-includes/nav-menu.php at r18427

File:

• branches/3.2/wp-includes/nav-menu.php (modified) (1 diff)

branches/3.2/wp-includes/nav-menu.php

@@ -606 +606 @@
 
                 $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;