Index: meta-boxes.php
===================================================================
--- meta-boxes.php	(revision 16405)
+++ meta-boxes.php	(working copy)
@@ -153,16 +153,20 @@
 
 <?php
 if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
-$post_formats = get_theme_support( 'post-formats' );
+$post_format_support = get_theme_support( 'post-formats' );
 
-if ( is_array( $post_formats[0] ) ) : 
+if ( is_array( $post_format_support[0] ) || $post_format_support === true ) : 
+	if ( !is_array( $post_format_support[0] ) )
+		$post_formats = array_keys( get_post_format_strings() );
+	else
+		$post_formats = $post_format_support[0];
 	$post_format = get_post_format( $post->ID );
 	if ( !$post_format )
 		$post_format = '0';
 	$post_format_display = get_post_format_string( $post_format );
 	// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-	if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
-		$post_formats[0][] = $post_format;
+	if ( $post_format && !in_array( $post_format, $post_formats ) )
+		$post_formats[] = $post_format;	
 ?>
 <div class="misc-pub-section" id="post-formats"><label for="post-format"><?php _e( 'Format:' ); ?></label>
 
@@ -171,8 +175,10 @@
 <div id="post-formats-select" class="hide-if-js">
 <input type="hidden" id="old-post-format" value="<?php echo esc_attr( $post_format ); ?>" />
 	<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0"><?php _e('Default'); ?></label>
-	<?php foreach ( $post_formats[0] as $format ) : ?>
+	<?php foreach ( $post_formats as $format ) : ?>
+	<?php if( $format !== 0 ) : ?>
 	<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+	<?php endif; ?>
 	<?php endforeach; ?><br />
 	<p>
 	 <a href="#post-formats" class="save-post-format hide-if-no-js button"><?php _e('OK'); ?></a>