Ticket #24116: 24116.4.diff

wp-admin/includes/screen.php

@@ -148 +148 @@
  * @return string HTML for the screen icon.
  */
 function get_screen_icon( $screen = '' ) {
-        global $post_ID;
         if ( empty( $screen ) )
                 $screen = get_current_screen();
         elseif ( is_string( $screen ) )
@@ -168 +167 @@
                 if ( $screen->post_type )
                         $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $screen->post_type );
 
-                if ( $post_ID ) {
-                        $format = get_post_format( $post_ID );
-                        if ( $format )
-                                $class .= ' wp-format-' . $format;
+                if ( 'post' == $screen->id ) {
+                        $post_format = get_post_format();
+                        if ( ! $post_format && ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
+                                $post_format = $_REQUEST['format'];
+
+                        if ( $post_format )
+                                $class .= ' wp-format-' . $post_format;
                 }
         }
 

wp-admin/edit-form-advanced.php

@@ -139 +139 @@
 
         if ( ! $post_format ) {
                 $post_format = 'standard';
-                if ( 'auto-draft' == $post->post_status )
+
+                if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
+                        $post_format = $_REQUEST['format'];
+                elseif ( 'auto-draft' == $post->post_status )
                         $post_format_set_class = '';
         }