Ticket #16047: 16047.2.diff

wp-admin/admin-ajax.php

@@ -1036 +1036 @@
         if ( ! $user = wp_get_current_user() )
                 die('-1');
 
+        set_current_screen( $page );
+        $screen = get_current_screen();
         if ( is_array($hidden) )
                 update_user_option($user->ID, "manage{$page}columnshidden", $hidden, true);
+        
+        // show post format column if it's not found in $hidden 
+        if ( $screen->base == 'edit' && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) && ! in_array( 'format', $hidden ) && ! get_user_option( "{$screen->id}postformatsshown" ) )
+                update_user_option( $user->ID, "{$screen->id}postformatsshown", 1 );
 
         die('1');
         break;

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

@@ -272 +272 @@
 
                 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' );
 
                 if ( empty( $post_type ) || is_object_in_taxonomy( $post_type, 'category' ) )
                         $posts_columns['categories'] = __( 'Categories' );
@@ -663 +666 @@
                         ?></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:
                         ?>

wp-admin/includes/template.php

@@ -254 +254 @@
         if ( is_string( $screen ) )
                 $screen = convert_to_screen( $screen );
 
-        return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
+        $hidden = (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
+
+        // post format column is hidden by default
+        if ( $screen->base == 'edit' && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) && ! in_array( 'format', $hidden ) && ! get_user_option( "{$screen->id}postformatsshown" ) )
+                $hidden[] = 'format';
+
+        return $hidden;
 }
 
 // adds hidden fields with the data for use in the inline editor for posts and pages
@@ -1646 +1652 @@
                         echo "<span class='post-state'>$state$sep</span>";
                 }
         }
-
-        if ( get_post_format( $post->ID ) )
-                echo ' - <span class="post-state-format">' . get_post_format_string( get_post_format( $post->ID ) ) . '</span>';
 }
 
 /**