Changeset 33089

Timestamp:

07/06/2015 05:52:59 AM (9 years ago)

Author:

westonruter

Message:

Customizer: Ensure that a newly-added nav menu item gets the Original link populated in its control.

Props valendesigns.
Fixes #32858.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-nav-menus.php (modified) (4 diffs)
• tests/phpunit/tests/customize/nav-menus.php (modified) (2 diffs)

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

@@ -121 +121 @@
                     '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 ) ),
                 );
             }
@@ -148 +149 @@
                     '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 ),
                 );
             }
@@ -229 +231 @@
                 $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 ) ),
                 );
             }
@@ -251 +254 @@
                 $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 ),
                 );
             }

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

@@ -98 +98 @@
             $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' );
@@ -116 +117 @@
             $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 ) );