Ticket #15882: 15882.2.diff

wp-admin/includes/meta-boxes.php

@@ -247 +247 @@
         if ( is_array( $post_formats[0] ) ) :
                 $post_format = get_post_format( $post->ID );
                 if ( !$post_format )
-                        $post_format = get_option('default_post_format', '0');
+                        $post_format = '0';
                 $post_format_display = get_post_format_string( $post_format );
                 // Add in the current one if it isn't there yet, in case the current theme doesn't support it
                 if ( $post_format && !in_array( $post_format, $post_formats[0] ) )

wp-admin/includes/post.php

@@ -391 +391 @@
                         wp_delete_post( $delete, true ); // Force delete
                 $post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
                 $post = get_post( $post_id );
+                if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
+                        set_post_format( $post, get_option( 'default_post_format' ) );
         } else {
                 $post->ID = 0;
                 $post->post_author = '';