Ticket #8592: 8592.patch

wp-admin/includes/class-wp-posts-list-table.php

@@ -844 +844 @@
                         <label>
                                 <span class="title"><?php _e( 'Parent' ); ?></span>
         <?php
-                $dropdown_args = array( 'post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __( 'Main Page (no parent)' ), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title' );
+                if ( current_user_can( $post_type_object->cap->read_private_pages ) )
+                        $post_status = array( 'publish', 'private' );
+                else
+                        $post_status = 'publish';
+
+                $dropdown_args = array(
+                        'post_type'         => $post_type_object->name,
+                        'selected'          => $post->post_parent,
+                        'name'              => 'post_parent',
+                        'show_option_none'  => __( 'Main Page (no parent)' ),
+                        'option_none_value' => 0,
+                        'sort_column'       => 'menu_order, post_title',
+                        'post_status'       => $post_status
+                );
+
                 if ( $bulk )
                         $dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
                 $dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );

wp-admin/includes/meta-boxes.php

@@ -556 +556 @@
 function page_attributes_meta_box($post) {
         $post_type_object = get_post_type_object($post->post_type);
         if ( $post_type_object->hierarchical ) {
-                $pages = wp_dropdown_pages(array('post_type' => $post->post_type, 'exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('(no parent)'), 'sort_column'=> 'menu_order, post_title', 'echo' => 0));
+                if ( current_user_can( $post_type_object->cap->read_private_posts ) )
+                        $post_status = array( 'publish', 'private' );
+                else
+                        $post_status = 'publish';
+
+                $pages = wp_dropdown_pages( array(
+                        'post_type' => $post->post_type,
+                        'exclude_tree' => $post->ID,
+                        'selected' => $post->post_parent,
+                        'name' => 'parent_id',
+                        'show_option_none' => __( '(no parent)' ),
+                        'sort_column'=> 'menu_order, post_title',
+                        'echo' => 0,
+                        'post_status' => $post_status
+                ) );
                 if ( ! empty($pages) ) {
 ?>
 <p><strong><?php _e('Parent') ?></strong></p>

wp-includes/post-template.php

@@ -760 +760 @@
                 'selected' => 0, 'echo' => 1,
                 'name' => 'page_id', 'id' => '',
                 'show_option_none' => '', 'show_option_no_change' => '',
-                'option_none_value' => ''
+                'option_none_value' => '',
+                'post_status' => 'publish'
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -1094 +1095 @@
          * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
          */
         function start_el(&$output, $page, $depth, $args) {
+                $post_states = array();
                 $pad = str_repeat(' ', $depth * 3);
 
                 $output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
                 if ( $page->ID == $args['selected'] )
                         $output .= ' selected="selected"';
                 $output .= '>';
-                $title = apply_filters( 'list_pages', $page->post_title );
+                $title = $page->post_title;
+
+                if ( !empty( $page->post_password ) )
+                        $post_states['protected'] = __( 'Password protected' );
+
+                if ( 'private' == $page->post_status )
+                        $post_states['private'] = __( 'Private' );
+
+                if ( 'draft' == $page->post_status )
+                        $post_states['draft'] = __( 'Draft' );
+
+                if ( 'pending' == $page->post_status )
+                        // translators: post state
+                        $post_states['pending'] = _x( 'Pending', 'post state' );
+
+                if ( is_sticky( $page->ID ) )
+                        $post_states['sticky'] = __( 'Sticky' );
+
+                $post_states = apply_filters( 'display_post_states', $post_states );
+
+                if ( ! empty( $post_states ) ) {
+                        $states = implode( ', ', $post_states );
+                        $title  = $title . sprintf( ' (%s)', $states );
+                }
+
+                $title = apply_filters( 'list_pages', $title );
+                $title = esc_html($title);
                 $output .= $pad . esc_html( $title );
                 $output .= "</option>\n";
         }

wp-includes/post.php

@@ -3322 +3322 @@
                 return false;
 
         // Make sure we have a valid post status
-        if ( !in_array($post_status, get_post_stati()) )
+        if ( !is_array( $post_status ) )
+                $post_status = explode( ',', $post_status );
+        if ( count( array_diff( $post_status, get_post_stati() ) ) )
                 return false;
 
         $cache = array();
@@ -3417 +3419 @@
         if ( $parent >= 0 )
                 $where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
 
-        $where_post_type = $wpdb->prepare( "post_type = '%s' AND post_status = '%s'", $post_type, $post_status );
+        if ( 1 == count( $post_status ) ) {
+                $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $post_type, array_shift( $post_status ) );
+        } else {
+                $post_status = implode( "', '", $post_status );
+                $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $post_type );
+        }
 
         $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
         $query .= $author_query;