Ticket #32858: 32858.diff

src/wp-includes/class-wp-customize-nav-menus.php

@@ -120 +120 @@
                                         'type'       => 'post_type',
                                         'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
                                         'object'     => $post->post_type,
-                                        'object_id'  => (int) $post->ID,
+                                        'object_id'  => intval( $post->ID ),
+                                        'url'        => get_permalink( intval( $post->ID ) ),
                                 );
                         }
                 } elseif ( 'taxonomy' === $obj_type ) {
@@ -147 +148 @@
                                         'type'       => 'taxonomy',
                                         'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
                                         'object'     => $term->taxonomy,
-                                        'object_id'  => $term->term_id,
+                                        'object_id'  => intval( $term->term_id ),
+                                        'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
                                 );
                         }
                 }
@@ -228 +230 @@
                                 }
                                 $results[] = array(
                                         'id'         => 'post-' . $post->ID,
+                                        'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                         'type'       => 'post_type',
                                         'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
                                         'object'     => $post->post_type,
                                         'object_id'  => intval( $post->ID ),
-                                        'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+                                        'url'        => get_permalink( intval( $post->ID ) ),
                                 );
                         }
                 }
@@ -250 +253 @@
                         foreach ( $terms as $term ) {
                                 $results[] = array(
                                         'id'         => 'term-' . $term->term_id,
+                                        'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                         'type'       => 'taxonomy',
                                         'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
                                         'object'     => $term->taxonomy,
                                         'object_id'  => intval( $term->term_id ),
-                                        'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+                                        'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
                                 );
                         }
                 }

tests/phpunit/tests/customize/nav-menus.php

@@ -97 +97 @@
                 foreach ( $post_ids as $post_id ) {
                         $expected = array(
                                 'id'         => 'post-' . $post_id,
+                                'title'      => html_entity_decode( get_the_title( $post_id ) ),
                                 'type'       => 'post_type',
                                 'type_label' => get_post_type_object( 'post' )->labels->singular_name,
                                 'object'     => 'post',
                                 'object_id'  => intval( $post_id ),
-                                'title'      => html_entity_decode( get_the_title( $post_id ) ),
+                                'url'        => get_permalink( intval( $post_id ) ),
                         );
                         wp_set_object_terms( $post_id, $term_ids, 'category' );
                         $search = $post_id === $post_ids[0] ? 'test & search' : 'other title';
@@ -115 +116 @@
                         $term = get_term_by( 'id', $term_id, 'category' );
                         $expected = array(
                                 'id'         => 'term-' . $term_id,
+                                'title'      => $term->name,
                                 'type'       => 'taxonomy',
                                 'type_label' => get_taxonomy( 'category' )->labels->singular_name,
                                 'object'     => 'category',
                                 'object_id'  => intval( $term_id ),
-                                'title'      => $term->name,
+                                'url'        => get_term_link( intval( $term_id ), 'category' ),
                         );
                         $s = sanitize_text_field( wp_unslash( $term->name ) );
                         $results = $menus->search_available_items_query( array( 'pagenum' => 1, 's' => $s ) );