Ticket #37782: 37782.5.diff

src/wp-admin/css/nav-menus.css

@@ -409 +409 @@
         margin-top: -4px;
 }
 
+.menu-item-title .post-state {
+        font-weight: 600;
+}
+
 /* Nav Menu */
 #menu-container .inside {
         padding-bottom: 10px;

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

@@ -93 +93 @@
                         $title = $item->label;
                 } 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 );
-                        }
+                        $title = apply_filters( 'the_title', $item->post_title, $item->ID );                    
                 }
 
                 $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
+
+                if ( empty( $item->label ) && isset( $item->post_type ) && 'page' === $item->post_type ) {
+                        /** Append post states */
+                        $output .= _post_states( $item, false );
+                }
+
                 $output .= '</label>';
 
                 // Menu item hidden fields

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

@@ -354 +354 @@
                 $args = array_merge( $args, (array) $box['args']->_default_query );
         }
 
+        /*
+         * If we're dealing with pages, let's prioritize the front page,
+         * posts page and privacy page at the top of the list.
+         */
+        $important_pages = array();
+        if ( 'page' == $post_type_name ) {
+                $suppress_page_ids = array();
+
+                $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_policy_page_id                 = (int) get_option( 'wp_page_for_privacy_policy' );
+                $privacy_policy_page_available  = false;
+
+                if ( ! empty( $privacy_policy_page_id ) ) {
+                        $privacy_policy_page                    = get_post( $privacy_policy_page_id );
+                        $privacy_policy_page_available  = ( $privacy_policy_page instanceof WP_Post && $privacy_policy_page->post_status === 'publish' );
+                }
+
+                /*
+                 * Insert Front Page or custom home link.
+                 */
+                $front_page_obj = null;
+                if ( ! empty( $front_page ) ) {
+                        $front_page_obj                 = get_post( $front_page );
+                        $front_page_obj->front_or_home  = true;
+
+                        $suppress_page_ids[]                    = $front_page_obj->ID;
+                } else {
+                        $_nav_menu_placeholder  = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
+                        $front_page_obj                 = (object) array(
+                                'front_or_home' => true,
+                                'ID'            => 0,
+                                'object_id'     => $_nav_menu_placeholder,
+                                'post_content'  => '',
+                                'post_excerpt'  => '',
+                                'post_parent'   => '',
+                                'post_title'    => _x( 'Home', 'nav menu home label' ),
+                                'post_type'     => 'nav_menu_item',
+                                'type'          => 'custom',
+                                'url'           => home_url( '/' ),
+                        );
+                }
+                $important_pages[] = $front_page_obj;
+
+
+                /*
+                 * Insert Posts Page.
+                 */
+                if ( ! empty( $posts_page ) ) {
+                        $posts_page_obj                         = get_post( $posts_page );
+                        $posts_page_obj->posts_page = true;
+
+                        $important_pages[]                      = $posts_page_obj;
+                        $suppress_page_ids[]            = $posts_page_obj->ID;
+                }
+
+                /*
+                 * Insert Privacy Page.
+                 */
+                if ( $privacy_policy_page_available ) {
+                        $privacy_policy_page_obj                                = get_post( $privacy_policy_page_id );
+                        $privacy_policy_page_obj->privacy_policy_page   = true;
+
+                        $important_pages[]                                                              = $privacy_policy_page_obj;
+                        $suppress_page_ids[]                                                    = $privacy_policy_page_obj->ID;
+                }
+
+                /*
+                 * Add suppression array to arguments for WP_Query
+                 */
+                if ( ! empty( $suppress_page_ids ) ) {
+                        $args['post__not_in'] = $suppress_page_ids;
+                }
+        }
+
         // @todo transient caching of these results with proper invalidation on updating of a post of this type
         $get_posts = new WP_Query;
         $posts     = $get_posts->query( $args );
+
+        /** Only suppress and insert when more than just important pages available */
         if ( ! $get_posts->post_count ) {
-                echo '<p>' . __( 'No items.' ) . '</p>';
-                return;
+                if ( ! empty( $important_pages ) ) {
+                        unset($args['post__not_in']);
+                        $get_posts = new WP_Query;
+                        $posts     = $get_posts->query( $args );
+                } else {
+                        echo '<p>' . __( 'No items.' ) . '</p>';
+                        return;
+                }
+        } else {
+                if ( ! empty( $important_pages ) ) {
+                        $posts = array_merge( $important_pages, $posts );
+                }               
         }
 
         $num_pages = $get_posts->max_num_pages;
@@ -520 +608 @@
                                 <?php
                                 $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 ( 'page' == $post_type_name ) {
-                                        $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
-                                        if ( ! empty( $front_page ) ) {
-                                                $front_page_obj                = get_post( $front_page );
-                                                $front_page_obj->front_or_home = true;
-                                                array_unshift( $posts, $front_page_obj );
-                                        } else {
-                                                $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
-                                                array_unshift(
-                                                        $posts,
-                                                        (object) array(
-                                                                'front_or_home' => true,
-                                                                'ID'            => 0,
-                                                                'object_id'     => $_nav_menu_placeholder,
-                                                                'post_content'  => '',
-                                                                'post_excerpt'  => '',
-                                                                'post_parent'   => '',
-                                                                'post_title'    => _x( 'Home', 'nav menu home label' ),
-                                                                'post_type'     => 'nav_menu_item',
-                                                                'type'          => 'custom',
-                                                                'url'           => home_url( '/' ),
-                                                        )
-                                                );
-                                        }
-                                }
-
                                 $post_type = get_post_type_object( $post_type_name );
 
                                 if ( $post_type->has_archive ) {

src/wp-admin/includes/template.php

@@ -1871 +1871 @@
 /**
  * @param WP_Post $post
  */
-function _post_states( $post ) {
+function _post_states( $post, $echo = true ) {
+        $post_states = get_post_states( $post );
+        $post_states_string = '';
+
+        if ( ! empty( $post_states ) ) {
+                $state_count = count( $post_states );
+                $i           = 0;
+                $post_states_string .= ' — ';
+                foreach ( $post_states as $state ) {
+                        ++$i;
+                        ( $i == $state_count ) ? $sep = '' : $sep = ', ';
+                        $post_states_string .= "<span class='post-state'>$state$sep</span>";
+                }
+        }
+
+        if ( $echo ) {
+                echo $post_states_string;
+        }
+        return $post_states_string;
+}
+
+/**
+ * @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 +1956 @@
          * @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 );
 }
 
 /**