Ticket #36212: 36212.3.diff

src/wp-admin/includes/nav-menu.php

@@ -1181 +1181 @@
         if ( ! empty( $_POST['menu-item-db-id'] ) ) {
                 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 ] ) {
-                                continue;
-                        }
-
                         $args = array();
                         foreach ( $post_fields as $field ) {
                                 $args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : '';

src/wp-includes/nav-menu.php

@@ -476 +476 @@
 
                 $args['menu-item-url'] = '';
 
-                $original_title = '';
                 if ( 'taxonomy' === $args['menu-item-type'] ) {
                         $original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
-                        $original_title  = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
                 } elseif ( 'post_type' === $args['menu-item-type'] ) {
 
                         $original_object = get_post( $args['menu-item-object-id'] );
                         $original_parent = (int) $original_object->post_parent;
-                        $original_title  = $original_object->post_title;
                 } elseif ( 'post_type_archive' === $args['menu-item-type'] ) {
                         $original_object = get_post_type_object( $args['menu-item-object'] );
-                        if ( $original_object ) {
-                                $original_title = $original_object->labels->archives;
-                        }
-                }
-
-                if ( $args['menu-item-title'] == $original_title ) {
-                        $args['menu-item-title'] = '';
                 }
 
                 // Hack to get wp to create a post object when too many properties are empty.
@@ -837 +827 @@
 
                                 if ( $original_object ) {
                                         $menu_item->url = get_permalink( $original_object->ID );
-                                        /** This filter is documented in wp-includes/post-template.php */
-                                        $original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID );
                                 } else {
                                         $menu_item->url      = '';
-                                        $original_title      = '';
                                         $menu_item->_invalid = true;
                                 }
 
-                                if ( '' === $original_title ) {
-                                        /* translators: %d: ID of a post. */
-                                        $original_title = sprintf( __( '#%d (no title)' ), $menu_item->object_id );
-                                }
-
-                                $menu_item->title = ( '' === $menu_item->post_title ) ? $original_title : $menu_item->post_title;
+                                $menu_item->title = $menu_item->post_title;
 
                         } elseif ( 'post_type_archive' === $menu_item->type ) {
                                 $object = get_post_type_object( $menu_item->object );