Changeset 60832 for branches/5.4/src/wp-includes/class-wp-customize-nav-menus.php

Timestamp:

09/30/2025 05:04:35 PM (11 months ago)

Author:

desrosj

Message:

Grouped backports for the 5.4 branch.

• REST API: Increase the specificity of capability checks for collections when the edit context is in use.
• Menus: Prevent HTML in menu item titles from being rendered unexpectedly.

Merges [60814], [60815], [60816] to the 5.4 branch.

Props andraganescu, desrosj, ehti, hurayraiit, iandunn, joehoyle, johnbillion, jorbin, mnelson4, noisysocks, peterwilsoncc, phillsav, rmccue, timothyblynjacobs, vortfu, westonruter , whyisjake, zieladam.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-nav-menus.php (modified) (3 diffs)

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

@@ -159 +159 @@
                         } elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
                                 // Add a post type archive link.
+                                $title   = $post_type->labels->archives;
                                 $items[] = array(
-                                        'id'         => $object . '-archive',
-                                        'title'      => $post_type->labels->archives,
-                                        'type'       => 'post_type_archive',
-                                        'type_label' => __( 'Post Type Archive' ),
-                                        'object'     => $object,
-                                        'url'        => get_post_type_archive_link( $object ),
+                                        'id'             => $object_name . '-archive',
+                                        'title'          => $title,
+                                        'original_title' => $title,
+                                        'type'           => 'post_type_archive',
+                                        'type_label'     => __( 'Post Type Archive' ),
+                                        'object'         => $object_name,
+                                        'url'            => get_post_type_archive_link( $object_name ),
                                 );
                         }
@@ -199 +201 @@
                                         $post_title = sprintf( __( '#%d (no title)' ), $post->ID );
                                 }
+
+                                $post_type_label = get_post_type_object( $post->post_type )->labels->singular_name;
+                                $post_states     = get_post_states( $post );
+                                if ( ! empty( $post_states ) ) {
+                                        $post_type_label = implode( ',', $post_states );
+                                }
+
+                                $title   = html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
                                 $items[] = array(
-                                        'id'         => "post-{$post->ID}",
-                                        'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
-                                        'type'       => 'post_type',
-                                        'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
-                                        'object'     => $post->post_type,
-                                        'object_id'  => intval( $post->ID ),
-                                        'url'        => get_permalink( intval( $post->ID ) ),
+                                        'id'             => "post-{$post->ID}",
+                                        'title'          => $title,
+                                        'original_title' => $title,
+                                        'type'           => 'post_type',
+                                        'type_label'     => $post_type_label,
+                                        'object'         => $post->post_type,
+                                        'object_id'      => (int) $post->ID,
+                                        'url'            => get_permalink( (int) $post->ID ),
                                 );
                         }
@@ -230 +241 @@
 
                         foreach ( $terms as $term ) {
+                                $title   = html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) );
                                 $items[] = 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 ),
-                                        'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+                                        'id'             => "term-{$term->term_id}",
+                                        'title'          => $title,
+                                        'original_title' => $title,
+                                        'type'           => 'taxonomy',
+                                        'type_label'     => get_taxonomy( $term->taxonomy )->labels->singular_name,
+                                        'object'         => $term->taxonomy,
+                                        'object_id'      => (int) $term->term_id,
+                                        'url'            => get_term_link( (int) $term->term_id, $term->taxonomy ),
                                 );
                         }