From 30d5fe1b4148d242efc31af6c69c81056af4e236 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <mark@wordpress.org>
Date: Thu, 25 Apr 2013 06:08:29 +0000
Subject: [PATCH] Allow any post format to be default, not just ones with
 explicit support.

props SergeyBiryukov. fixes #24036.

git-svn-id: http://core.svn.wordpress.org/trunk@24089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-writing.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index eafde3d15e..8015bae418 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -79,23 +79,21 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_category', 'o
 </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">