Ticket #16047: 16047.4.diff

Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php     (revision 23386)
+++ wp-admin/includes/class-wp-posts-list-table.php     (working copy)
@@ -258,6 +258,9 @@
 
                if ( post_type_supports( $post_type, 'author' ) )
                        $posts_columns['author'] = __( 'Author' );
+       
+               if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
+                       $posts_columns['format'] = _x( 'Format', 'post format' );
 
                $taxonomies = array();
 
@@ -645,6 +648,15 @@
                        ?></td>
                        <?php
                        break;
+                       
+                       case 'format':
+                       ?>
+                       <td <?php echo $attributes ?>><?php
+                               if ( get_post_format( $post->ID ) )
+                                               echo get_post_format_string( get_post_format( $post->ID ) );
+                       ?></td>
+                       <?php
+                       break;
 
                        default:
                                if ( 'categories' == $column_name )
Index: wp-admin/includes/screen.php
===================================================================
--- wp-admin/includes/screen.php        (revision 23386)
+++ wp-admin/includes/screen.php        (working copy)
@@ -38,7 +38,17 @@
        if ( is_string( $screen ) )
                $screen = convert_to_screen( $screen );
 
-       return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
+               $hidden = get_user_option( 'manage' . $screen->id . 'columnshidden' );
+
+               // Hide columns by default
+               if ( ! is_array( $hidden ) ) {
+                       if ( 'edit' == $screen->base && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) )
+                               $hidden = array( 'format' );
+
+                       $hidden = apply_filters('default_hidden_columns', (array) $hidden, $screen);
+               }
+
+               return $hidden;
 }
 
 /**
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php      (revision 23386)
+++ wp-admin/includes/template.php      (working copy)
@@ -1449,8 +1449,6 @@
                }
        }
 
-       if ( get_post_format( $post->ID ) )
-               echo ' - <span class="post-state-format">' . get_post_format_string( get_post_format( $post->ID ) ) . '</span>';
 }
 
 function _media_states( $post ) {