Changeset 45891
- Timestamp:
- 08/25/2019 09:31:43 PM (4 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php
r45697 r45891 72 72 73 73 $original_title = false; 74 74 75 if ( 'taxonomy' == $item->type ) { 75 $original_ title = get_term_field( 'name', $item->object_id, $item->object, 'raw');76 if ( is_wp_error( $original_title ) ) {77 $original_title = false;76 $original_object = get_term( (int) $item->object_id, $item->object ); 77 if ( $original_object && ! is_wp_error( $original_title ) ) { 78 $original_title = $original_object->name; 78 79 } 79 80 } elseif ( 'post_type' == $item->type ) { 80 81 $original_object = get_post( $item->object_id ); 81 $original_title = get_the_title( $original_object->ID ); 82 if ( $original_object ) { 83 $original_title = get_the_title( $original_object->ID ); 84 } 82 85 } elseif ( 'post_type_archive' == $item->type ) { 83 86 $original_object = get_post_type_object( $item->object ); -
trunk/src/wp-includes/nav-menu.php
r45723 r45891 820 820 } 821 821 822 $menu_item->url = get_permalink( $menu_item->object_id );823 824 822 $original_object = get_post( $menu_item->object_id ); 825 /** This filter is documented in wp-includes/post-template.php */ 826 $original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID ); 823 824 if ( $original_object ) { 825 $menu_item->url = get_permalink( $original_object->ID ); 826 /** This filter is documented in wp-includes/post-template.php */ 827 $original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID ); 828 } else { 829 $menu_item->url = ''; 830 $original_title = ''; 831 $menu_item->_invalid = true; 832 } 827 833 828 834 if ( '' === $original_title ) { 829 835 /* translators: %d: ID of a post */ 830 $original_title = sprintf( __( '#%d (no title)' ), $ original_object->ID);836 $original_title = sprintf( __( '#%d (no title)' ), $menu_item->object_id ); 831 837 } 832 838 833 $menu_item->title = '' == $menu_item->post_title? $original_title : $menu_item->post_title;839 $menu_item->title = ( '' === $menu_item->post_title ) ? $original_title : $menu_item->post_title; 834 840 835 841 } elseif ( 'post_type_archive' == $menu_item->type ) { 836 842 $object = get_post_type_object( $menu_item->object ); 837 843 if ( $object ) { 838 $menu_item->title = '' == $menu_item->post_title? $object->labels->archives : $menu_item->post_title;844 $menu_item->title = ( '' === $menu_item->post_title ) ? $object->labels->archives : $menu_item->post_title; 839 845 $post_type_description = $object->description; 840 846 } else { 847 $post_type_description = ''; 841 848 $menu_item->_invalid = true; 842 $post_type_description = '';843 849 } 844 850 845 851 $menu_item->type_label = __( 'Post Type Archive' ); 846 852 $post_content = wp_trim_words( $menu_item->post_content, 200 ); 847 $post_type_description = '' == $post_content? $post_type_description : $post_content;853 $post_type_description = ( '' === $post_content ) ? $post_type_description : $post_content; 848 854 $menu_item->url = get_post_type_archive_link( $menu_item->object ); 855 849 856 } elseif ( 'taxonomy' == $menu_item->type ) { 850 857 $object = get_taxonomy( $menu_item->object ); … … 856 863 } 857 864 858 $term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object ); 859 $menu_item->url = ! is_wp_error( $term_url ) ? $term_url : ''; 860 861 $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' ); 862 if ( is_wp_error( $original_title ) ) { 863 $original_title = false; 865 $original_object = get_term( (int) $menu_item->object_id, $menu_item->object ); 866 867 if ( $original_object && ! is_wp_error( $original_object ) ) { 868 $menu_item->url = get_term_link( (int) $menu_item->object_id, $menu_item->object ); 869 $original_title = $original_object->name; 870 } else { 871 $menu_item->url = ''; 872 $original_title = ''; 873 $menu_item->_invalid = true; 864 874 } 865 $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; 875 876 if ( '' === $original_title ) { 877 /* translators: %d: ID of a term */ 878 $original_title = sprintf( __( '#%d (no title)' ), $menu_item->object_id ); 879 } 880 881 $menu_item->title = ( '' === $menu_item->post_title ) ? $original_title : $menu_item->post_title; 866 882 867 883 } else {
Note: See TracChangeset
for help on using the changeset viewer.