Changeset 17056

Timestamp:

12/19/2010 05:36:11 AM (14 years ago)

Author:

nacin

Message:

Allow dfault post format selections. fixes #15882.

Location:

trunk

Files:

• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/version.php (modified) (2 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -248 +248 @@
         $post_format = get_post_format( $post->ID );
         if ( !$post_format )
-            $post_format = '0';
+            $post_format = get_option('default_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

trunk/wp-admin/includes/schema.php

@@ -319 +319 @@
     'page_for_posts' => 0,
     'page_on_front' => 0,
+
+    // 3.1
+    'default_post_format' => 0,
     );
 

trunk/wp-admin/options-writing.php

@@ -57 +57 @@
 </td>
 </tr>
+<?php
+if ( current_theme_supports( 'post-formats' ) ) :
+    $post_formats = get_theme_support( 'post-formats' );
+    if ( is_array( $post_formats[0] ) ) :
+?>
+<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>
+<?php endforeach; ?>
+    </select></label>
+</td>
+</tr>
+<?php endif; endif; ?>
 <tr valign="top">
 <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>

trunk/wp-admin/options.php

@@ -61 +61 @@
     'privacy' => array( 'blog_public' ),
     'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
-    'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
+    'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format', 'enable_app', 'enable_xmlrpc' ),
     'options' => array( '' ) );
 

trunk/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '3.1-beta2-16997';
+$wp_version = '3.1-beta2-17056';
 
 /**
@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 15477;
+$wp_db_version = 17056;
 
 /**