Ticket #24146: 24146.patch

wp-admin/includes/nav-menu.php

@@ -1234 +1234 @@
                 foreach( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
                         // Menu item title can't be blank
-                        if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+                        if ( ! isset( $_POST['menu-item-title'][ $_key ] ) )
                                 continue;
 
                         $args = array();

wp-includes/nav-menu.php

@@ -336 +336 @@
                         $original_title = $original_object->post_title;
                 }
 
-                if ( $args['menu-item-title'] == $original_title )
-                        $args['menu-item-title'] = '';
+                if ( $args['menu-item-title'] != '' )
+                        $args['menu-item-title'] = $original_title;
 
                 // hack to get wp to create a post object when too many properties are empty
                 if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] )
@@ -595 +595 @@
 
                                 $menu_item->url = get_permalink( $menu_item->object_id );
 
-                                $original_object = get_post( $menu_item->object_id );
-                                $original_title = $original_object->post_title;
-                                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
-
                         } elseif ( 'taxonomy' == $menu_item->type ) {
                                 $object = get_taxonomy( $menu_item->object );
                                 if ( $object ) {
@@ -611 +607 @@
                                 $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 {
                                 $menu_item->type_label = __('Custom');
-                                $menu_item->title = $menu_item->post_title;
                                 $menu_item->url = empty( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
                         }
 
+                        $menu_item->title = $menu_item->post_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;