Ticket #15629: 15629.diff

wp-includes/post.php

@@ -535 +535 @@
                         $format = 'post-format-' . $format;
         }
 
-        return wp_set_post_terms($post->ID, $format, 'post_format');
+        if ( current_theme_supports( 'post-formats', $format ) )
+                return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
 /**

wp-includes/theme.php

@@ -1773 +1773 @@
                         else
                                 return false;
                         break;
+                case 'post-formats':
+                        // post-formats can be registered by passing an array of post formats to add_theme_supprt().
+                        $post_type = $args[0];
+                        if ( in_array($post_type, $_wp_theme_features[$feature][0]) )
+                                return true;
+                        else
+                                return false;
+                        break;
         }
 
         return true;