From fd0e34ec9f24fa5a0bb16333a5c38a457a997fe3 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 27 Mar 2014 00:06:15 +0000
Subject: [PATCH] The bulk editor and post format meta box should use the same
 checks for available post formats.

Props eightface.
Fixes #27187.


Built from https://develop.svn.wordpress.org/trunk@27762


git-svn-id: http://core.svn.wordpress.org/trunk@27599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-posts-list-table.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index e5e4a81e8c..4190920b2d 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -1197,19 +1197,20 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	<?php
 
-	if ( $bulk && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$all_post_formats = get_post_format_strings();
+	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
+		$post_formats = get_theme_support( 'post-formats' );
 
 		?>
 		<label class="alignleft" for="post_format">
 		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
 		<select name="post_format">
 			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
 			<?php
 
-			foreach ( $all_post_formats as $slug => $format ) {
+			foreach ( $post_formats[0] as $format ) {
 				?>
-				<option value="<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( $format ); ?></option>
+				<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
 				<?php
 			}