Ticket #37782: 37782.2.diff

src/wp-admin/includes/class-walker-nav-menu-checklist.php

@@ -94 +94 @@
                 } elseif ( isset( $item->post_type ) ) {
                         /** This filter is documented in wp-includes/post-template.php */
                         $title = apply_filters( 'the_title', $item->post_title, $item->ID );
-                        if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) {
-                                /* translators: %s: front page title */
-                                $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+                        
+                        /** Append post states */
+                        $post_states = get_post_states( $post );
+
+                        if ( ! empty( $post_states ) ) {
+                                $state_count = count( $post_states );
+                                $i           = 0;
+                                $title .= ' — ';
+                                foreach ( $post_states as $state ) {
+                                        ++$i;
+                                        ( $i == $state_count ) ? $sep = '' : $sep = ', ';
+                                        $title .= "<span class='post-state'>$state$sep</span>";
+                                }
                         }
                 }
 

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

@@ -521 +521 @@
                                 $args['walker'] = $walker;
 
                                 /*
-                                 * If we're dealing with pages, let's put a checkbox for the front
-                                 * page at the top of the list.
+                                 * If we're dealing with pages, let's put a checkbox(es) for the front
+                                 * page, posts page and privacy page at the top of the list.
                                  */
                                 if ( 'page' == $post_type_name ) {
                                         $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+                                        $posts_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
+                                        $privacy_page = (int) get_option( 'wp_page_for_privacy_policy' );
+
+                                        /*
+                                         * Supress important pages from $posts prior to re-inserting them at the top
+                                         * This avoids the duplicate entry in the list.
+                                         */
+                                        if ( ! ( empty( $front_page ) && empty( $posts_page ) && empty( $privacy_page ) ) ) {
+                                                foreach ( $posts as $key => $post ) {
+                                                        if ( $post->ID == $front_page || $post->ID == $posts_page || $post->ID == $privacy_page ) {
+                                                                unset( $posts[$key] );
+                                                        }
+                                                }
+                                        }
+
+                                        /*
+                                         * Insert Privacy Page.
+                                         */
+                                        if ( ! empty( $privacy_page ) ) {
+                                                $privacy_page_obj                = get_post( $privacy_page );
+                                                $privacy_page_obj->privacy_page = true;
+                                                array_unshift( $posts, $privacy_page_obj );
+                                        }
+
+                                        /*
+                                         * Insert Posts Page.
+                                         */
+                                        if ( ! empty( $posts_page ) ) {
+                                                $posts_page_obj                = get_post( $posts_page );
+                                                $front_page_obj->posts_page = true;
+                                                array_unshift( $posts, $posts_page_obj );
+                                        }
+
+                                        /*
+                                         * Insert Front Page or custom home link.
+                                         */
                                         if ( ! empty( $front_page ) ) {
                                                 $front_page_obj                = get_post( $front_page );
                                                 $front_page_obj->front_or_home = true;

src/wp-admin/includes/template.php

@@ -1872 +1872 @@
  * @param WP_Post $post
  */
 function _post_states( $post ) {
+        $post_states = get_post_states( $post );
+
+        if ( ! empty( $post_states ) ) {
+                $state_count = count( $post_states );
+                $i           = 0;
+                echo ' — ';
+                foreach ( $post_states as $state ) {
+                        ++$i;
+                        ( $i == $state_count ) ? $sep = '' : $sep = ', ';
+                        echo "<span class='post-state'>$state$sep</span>";
+                }
+        }
+}
+
+/**
+ * @param WP_Post $post
+ *
+ * @return array $post_states array of translated post states
+ *
+ * @since X.X.X
+ */
+function get_post_states( $post ) {
         $post_states = array();
         if ( isset( $_REQUEST['post_status'] ) ) {
                 $post_status = $_REQUEST['post_status'];
@@ -1928 +1950 @@
          * @param string[] $post_states An array of post display states.
          * @param WP_Post  $post        The current post object.
          */
-        $post_states = apply_filters( 'display_post_states', $post_states, $post );
-
-        if ( ! empty( $post_states ) ) {
-                $state_count = count( $post_states );
-                $i           = 0;
-                echo ' &mdash; ';
-                foreach ( $post_states as $state ) {
-                        ++$i;
-                        ( $i == $state_count ) ? $sep = '' : $sep = ', ';
-                        echo "<span class='post-state'>$state$sep</span>";
-                }
-        }
-
+        return apply_filters( 'display_post_states', $post_states, $post );
 }
 
 /**