Ticket #24036: 24036.patch

wp-admin/options-writing.php

@@ -79 +79 @@
 </td>
 </tr>
 <?php
-if ( current_theme_supports( 'post-formats' ) ) :
-        $post_formats = get_theme_support( 'post-formats' );
-        if ( is_array( $post_formats[0] ) ) :
+$post_formats = get_post_format_strings();
+unset( $post_formats['standard'] );
 ?>
 <tr valign="top">
 <th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
 <td>
         <select name="default_post_format" id="default_post_format">
-                <option value="0"><?php _e('Standard'); ?></option>
-<?php foreach ( $post_formats[0] as $format ): ?>
-                <option<?php selected( get_option('default_post_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>
 </td>
 </tr>
-<?php endif; endif;
-
+<?php
 if ( get_option( 'link_manager_enabled' ) ) :
 ?>
 <tr valign="top">