Ticket #17115: 17115.6.diff

src/wp-includes/post.php

@@ -3077 +3077 @@
                 $post_name = $post_before->post_name;
         }
 
-        $maybe_empty = 'attachment' !== $post_type
-                && ! $post_content && ! $post_title && ! $post_excerpt
-                && post_type_supports( $post_type, 'editor' )
-                && post_type_supports( $post_type, 'title' )
-                && post_type_supports( $post_type, 'excerpt' );
+        if ( 'attachment' === $post_type ) {
+                $maybe_empty = false;
+        } else {
+                $supports = 0;
+                if ( post_type_supports( $post_type, 'editor') ) {
+                        $supports ++;
+                        if ( empty( $post_content ) ) {
+                                $supports --;
+                        }
+                }
+                if ( post_type_supports( $post_type, 'title' ) ) {
+                        $supports ++;
+                        if ( empty( $post_title ) ) {
+                                $supports --;
+                        }
+                }
+                if ( post_type_supports( $post_type, 'excerpt' ) ) {
+                        $supports ++;
+                        if ( empty( $post_excerpt ) ) {
+                                $supports --;
+                        }
+                }
+                if ( $supports < 1 ) {
+                        $maybe_empty = true;
+                } else {
+                        $maybe_empty = false;
+                }
+        }
 
         /**
          * Filter whether the post should be considered "empty".