Ticket #24453: 24453.patch

wp-includes/post-formats.php

@@ -327 +327 @@
         if ( empty( $format ) || in_array( $format, array( 'status', 'aside', 'chat', 'gallery' ) ) )
                 return $content;
 
-        if ( current_theme_supports( 'structured-post-formats', $format ) )
+        if ( current_theme_supports( 'post-formats', $format ) )
                 return $content;
 
         $defaults = array(

wp-includes/theme.php

@@ -1259 +1259 @@
                 $args = array_slice( func_get_args(), 1 );
 
         switch ( $feature ) {
-                case 'structured-post-formats' :
+                case 'post-formats' :
                         if ( is_array( $args[0] ) )
                                 $args[0] = array_intersect( $args[0], get_post_format_slugs() );
-                        // structured-post-formats support automatically adds support for post-formats.
-                        $_wp_theme_features['post-formats'] = $args;
-                case 'post-formats' :
-                        // An existing structured-post-formats support declaration overrides post-formats.
-                        if ( current_theme_supports( 'structured-post-formats' ) )
-                                $args = get_theme_support( 'structured-post-formats' );
-                        elseif ( is_array( $args[0] ) )
-                                $args[0] = array_intersect( $args[0], get_post_format_slugs() );
                         break;
 
                 case 'custom-header-uploads' :
@@ -1555 +1547 @@
                         return in_array( $content_type, $_wp_theme_features[$feature][0] );
                         break;
 
-                case 'structured-post-formats':
                 case 'post-formats':
                         // specific post formats can be registered by passing an array of types to
                         // add_theme_support()