Ticket #24219: 24219.2.patch

wp-admin/press-this.php

@@ -69 +69 @@
         } else {
                 // Post formats
                 if ( isset( $_POST['post_format'] ) ) {
-                        if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
+                        if ( in_array( $_POST['post_format'], get_post_format_slugs() ) )
                                 set_post_format( $post_ID, $_POST['post_format'] );
                         elseif ( '0' == $_POST['post_format'] )
                                 set_post_format( $post_ID, false );
@@ -470 +470 @@
                                                 <span class="spinner" style="display: none;"></span>
                                         </p>
                                         <?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
-                                                        $post_formats = get_theme_support( 'post-formats' );
-                                                        if ( is_array( $post_formats[0] ) ) :
-                                                                $default_format = get_option( 'default_post_format', '0' );
-                                                ?>
+                                                $post_formats = get_post_format_strings();
+                                                unset( $post_formats['standard'] ); ?>
                                         <p>
                                                 <label for="post_format"><?php _e( 'Post Format:' ); ?>
                                                 <select name="post_format" id="post_format">
-                                                        <option value="0"><?php _ex( 'Standard', 'Post format' ); ?></option>
-                                                <?php foreach ( $post_formats[0] as $format ): ?>
-                                                        <option<?php selected( $default_format, $format ); ?> value="<?php echo esc_attr( $format ); ?>"> <?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+                                                        <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+                                                <?php foreach ( $post_formats as $format_slug => $format_name ): ?>
+                                                        <option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
                                                 <?php endforeach; ?>
                                                 </select></label>
                                         </p>
-                                        <?php endif; endif; ?>
+                                        <?php endif; ?>
                                 </div>
                         </div>
 

wp-includes/class-wp-xmlrpc-server.php

@@ -3369 +3369 @@
 
                 # find out if they want a list of currently supports formats
                 if ( isset( $args[3] ) && is_array( $args[3] ) ) {
-                        if ( $args[3]['show-supported'] ) {
-                                if ( current_theme_supports( 'post-formats' ) ) {
-                                        $supported = get_theme_support( 'post-formats' );
 
-                                        $data['all'] = $formats;
-                                        $data['supported'] = $supported[0];
-
-                                        $formats = $data;
-                                }
-                        }
+                        // All formats are supported since 3.6
+                        if ( ! empty( $args[3]['show-supported'] ) )
+                                $formats = array( 'all' => $formats, 'supported' => $formats );
                 }
 
                 return $formats;