Ticket #23198: 23198.diff

wp-includes/class-wp-editor.php

@@ -395 +395 @@
                         }
 
                         $body_class = $editor_id;
-
-                        if ( $post = get_post() )
-                                $body_class .= ' post-type-' . $post->post_type;
+                        $post = get_post();
+
+                        if ( $post ) {
+                                $body_class .= ' post-type-' . $post->post_type . ' post-status-' . $post->post_status;
+                                if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+                                        $post_format = get_post_format( $post );
+                                        if ( $post_format && ! is_wp_error( $post_format ) )
+                                                $body_class .= ' post-format-' . sanitize_html_class( $post_format );
+                                        else
+                                                $body_class .= ' post-format-standard';
+                                }
+                        }
 
                         if ( !empty($set['tinymce']['body_class']) ) {
                                 $body_class .= ' ' . $set['tinymce']['body_class'];

wp-includes/post-template.php

@@ -437 +437 @@
                         if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
                                 $post_format = get_post_format( $post->ID );
 
-                                if ( $post_format && !is_wp_error($post_format) )
+                                if ( $post_format && ! is_wp_error( $post_format ) )
                                         $classes[] = 'single-format-' . sanitize_html_class( $post_format );
                                 else
                                         $classes[] = 'single-format-standard';

wp-includes/post.php

@@ -758 +758 @@
  *
  * @since 3.1.0
  *
- * @param int|object $post A post
+ * @param int|object $post Post ID or post object. Optional, default is the current post from the loop.
  *
  * @return mixed The format if successful. False if no format is set. WP_Error if errors.
  */
 function get_post_format( $post = null ) {
-        $post = get_post($post);
+        $post = get_post( $post );
+
+        if ( empty( $post ) )
+                return new WP_Error( 'invalid_post', __( 'Invalid post' ) );
 
         if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
                 return false;