@@ -48,12 +49,16 @@ function post_submit_meta_box( $post, $args = array() ) {
post_status, array( 'publish', 'future', 'pending' ), true ) ) {
- $private_style = '';
+ $private_style = '';
+ $save_button_text = __( 'Save Draft' );
if ( 'private' === $post->post_status ) {
$private_style = 'style="display:none"';
+ } elseif ( $post_status_object && ! $post_status_object->_builtin ) {
+ /* translators: %s: Post status label. */
+ $save_button_text = sprintf( __( 'Save as %s' ), $post_status_object->label );
}
?>
-
type="submit" name="save" id="save-post" value="" class="button" />
+
type="submit" name="save" id="save-post" value="" class="button" />
post_status && $can_publish ) { ?>
@@ -121,6 +126,11 @@ function post_submit_meta_box( $post, $args = array() ) {
case 'auto-draft':
_e( 'Draft' );
break;
+ default:
+ if ( $post_status_object ) {
+ echo esc_html( $post_status_object->label );
+ }
+ break;
}
?>
@@ -161,6 +171,38 @@ function post_submit_meta_box( $post, $args = array() ) {
post_status, 'draft' ); ?> value='draft'>
+ _builtin && ! in_array( $post->post_status, $custom_post_statuses, true ) ) {
+ $custom_post_statuses[] = $post->post_status;
+ }
+
+ foreach ( $custom_post_statuses as $custom_post_status_name ) {
+ $custom_post_status = get_post_status_object( $custom_post_status_name );
+ if ( ! $custom_post_status || $custom_post_status->_builtin ) {
+ continue;
+ }
+
+ /* translators: %s: Post status label. */
+ $save_button_text = sprintf( __( 'Save as %s' ), $custom_post_status->label );
+ ?>
+ post_status, $custom_post_status->name ); ?> value="name ); ?>" data-save-text="">label ); ?>
+
diff --git a/tests/phpunit/tests/admin/metaBoxes.php b/tests/phpunit/tests/admin/metaBoxes.php
new file mode 100644
index 0000000000000..eaf6c4e463fd9
--- /dev/null
+++ b/tests/phpunit/tests/admin/metaBoxes.php
@@ -0,0 +1,138 @@
+user->create( array( 'role' => 'editor' ) );
+ }
+
+ public function tear_down() {
+ remove_filter( 'post_submitbox_custom_statuses', array( $this, 'filter_post_submitbox_custom_statuses' ) );
+ _unregister_post_status( 'reviewed' );
+ _unregister_post_status( 'hidden-status' );
+ unset( $GLOBALS['post'], $GLOBALS['action'] );
+
+ parent::tear_down();
+ }
+
+ /**
+ * Adds the reviewed status to the post Publish meta box.
+ *
+ * @param string[] $statuses Post status names.
+ * @param WP_Post $post Current post object.
+ * @return string[] Post status names.
+ */
+ public function filter_post_submitbox_custom_statuses( $statuses, $post ) {
+ if ( 'post' === $post->post_type ) {
+ $statuses[] = 'reviewed';
+ }
+
+ return $statuses;
+ }
+
+ /**
+ * @ticket 12706
+ *
+ * @covers ::post_submit_meta_box
+ */
+ public function test_post_submit_meta_box_includes_filtered_custom_post_statuses() {
+ require_once ABSPATH . 'wp-admin/includes/meta-boxes.php';
+
+ register_post_status(
+ 'reviewed',
+ array(
+ 'label' => 'Reviewed & approved',
+ 'protected' => true,
+ 'show_in_admin_status_list' => false,
+ )
+ );
+ register_post_status(
+ 'hidden-status',
+ array(
+ 'label' => 'Hidden status',
+ 'protected' => true,
+ 'show_in_admin_status_list' => true,
+ )
+ );
+ add_filter( 'post_submitbox_custom_statuses', array( $this, 'filter_post_submitbox_custom_statuses' ), 10, 2 );
+
+ $post = self::factory()->post->create_and_get();
+
+ wp_set_current_user( self::$editor_id );
+ $GLOBALS['post'] = $post;
+ $GLOBALS['action'] = 'edit';
+
+ ob_start();
+ post_submit_meta_box( $post );
+ $output = ob_get_clean();
+
+ $this->assertStringContainsString( 'value="reviewed" data-save-text="Save as Reviewed & approved">Reviewed & approved', $output );
+ $this->assertStringNotContainsString( 'Hidden status', $output );
+
+ $page = self::factory()->post->create_and_get( array( 'post_type' => 'page' ) );
+ $GLOBALS['post'] = $page;
+
+ ob_start();
+ post_submit_meta_box( $page );
+ $page_output = ob_get_clean();
+
+ $this->assertStringNotContainsString( 'Reviewed & approved', $page_output );
+ }
+
+ /**
+ * @ticket 12706
+ *
+ * @covers ::post_submit_meta_box
+ * @covers ::_wp_translate_postdata
+ */
+ public function test_post_submit_meta_box_includes_and_preserves_current_custom_post_status() {
+ require_once ABSPATH . 'wp-admin/includes/meta-boxes.php';
+
+ register_post_status(
+ 'hidden-status',
+ array(
+ 'label' => 'Hidden status',
+ 'protected' => true,
+ )
+ );
+
+ wp_set_current_user( self::$editor_id );
+ $post = self::factory()->post->create_and_get(
+ array(
+ 'post_author' => self::$editor_id,
+ 'post_status' => 'hidden-status',
+ )
+ );
+
+ $GLOBALS['post'] = $post;
+ $GLOBALS['action'] = 'edit';
+
+ ob_start();
+ post_submit_meta_box( $post );
+ $output = ob_get_clean();
+
+ $this->assertMatchesRegularExpression( '/\s*Hidden status\s*<\/span>/', $output );
+ $this->assertMatchesRegularExpression( '/]+selected=[\'\"]selected[\'\"][^>]+value=[\'\"]hidden-status[\'\"][^>]*>Hidden status<\/option>/', $output );
+ $this->assertStringContainsString( 'value="Save as Hidden status"', $output );
+
+ $translated_post_data = _wp_translate_postdata(
+ true,
+ array(
+ 'post_ID' => $post->ID,
+ 'post_type' => 'post',
+ 'post_status' => 'hidden-status',
+ 'save' => 'Save as Hidden status',
+ )
+ );
+
+ $this->assertSame( 'hidden-status', $translated_post_data['post_status'] );
+ }
+}
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index d0e81acedb502..4deccf160b515 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -168,6 +168,7 @@
+