Ticket #46397: 46397.diff

Index: src/wp-admin/includes/meta-boxes.php
===================================================================
--- src/wp-admin/includes/meta-boxes.php
+++ src/wp-admin/includes/meta-boxes.php
@@ -91,6 +91,12 @@ 
function post_submit_meta_box( $post, $args = array() ) {
        <?php _e( 'Status:' ); ?> <span id="post-status-display">
                        <?php
 
+                       // get only statuses that belong to this post type
+                       $post_stati = array_filter( get_post_stati( array(), 'objects' ), function( $args ) use ( $post ) {
+                               return ( is_string( $args->post_type ) && in_array( $args->post_type, array( 'all', $post->post_type ) ) ) 
+                                       || ( is_array ( $args->post_type ) && in_array( $post->post_type, $args->post_type ) ); 
+                       });
+
                        switch ( $post->post_status ) {
                                case 'private':
                                        _e( 'Privately Published' );
@@ -108,6 +114,13 @@ 
function post_submit_meta_box( $post, $args = array() ) {
                                case 'auto-draft':
                                        _e( 'Draft' );
                                        break;
+                               
+                               // default check if in stati array
+                               default: if ( in_array( $post->post_status, $post_stati ) ) :
+
+                                       // show the label
+                                       echo $post_stati[$post->post_status]->label;
+                                       endif; break;
                        }
                        ?>
 </span>
@@ -124,7 +137,14 @@ 
function post_submit_meta_box( $post, $args = array() ) {
 <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' == $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
 <label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
 <select name="post_status" id="post_status">
-               <?php if ( 'publish' == $post->post_status ) : ?>
+               <?php 
+               
+               // loop through the stati array to show it as <select> option
+               foreach ( $post_stati as $post_stati_key => $post_stati_args ) {
+                       echo '<option' . selected( $post->post_status, $post_stati_key, false ) . ' value="' . $post_stati_key . '">' . $post_stati_args->label . '</option>';
+               }
+               
+               if ( 'publish' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
 <?php elseif ( 'private' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>