<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17056] trunk: Allow dfault post format selections.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17056">17056</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-19 05:36:11 +0000 (Sun, 19 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow dfault post format selections. fixes <a href="http://trac.wordpress.org/ticket/15882">#15882</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (17055 => 17056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-12-19 05:23:25 UTC (rev 17055)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-12-19 05:36:11 UTC (rev 17056)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> if ( is_array( $post_formats[0] ) ) :
</span><span class="cx"> $post_format = get_post_format( $post->ID );
</span><span class="cx"> if ( !$post_format )
</span><del>- $post_format = '0';
</del><ins>+ $post_format = get_option('default_post_format', '0');
</ins><span class="cx"> $post_format_display = get_post_format_string( $post_format );
</span><span class="cx"> // Add in the current one if it isn't there yet, in case the current theme doesn't support it
</span><span class="cx"> if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (17055 => 17056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-12-19 05:23:25 UTC (rev 17055)
+++ trunk/wp-admin/includes/schema.php 2010-12-19 05:36:11 UTC (rev 17056)
</span><span class="lines">@@ -318,6 +318,9 @@
</span><span class="cx"> // 3.0
</span><span class="cx"> 'page_for_posts' => 0,
</span><span class="cx"> 'page_on_front' => 0,
</span><ins>+
+ // 3.1
+ 'default_post_format' => 0,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // 3.0 multisite
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (17055 => 17056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2010-12-19 05:23:25 UTC (rev 17055)
+++ trunk/wp-admin/options-writing.php 2010-12-19 05:36:11 UTC (rev 17056)
</span><span class="lines">@@ -56,7 +56,24 @@
</span><span class="cx"> ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+<?php
+if ( current_theme_supports( 'post-formats' ) ) :
+ $post_formats = get_theme_support( 'post-formats' );
+ if ( is_array( $post_formats[0] ) ) :
+?>
</ins><span class="cx"> <tr valign="top">
</span><ins>+<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">
</ins><span class="cx"> <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (17055 => 17056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-12-19 05:23:25 UTC (rev 17055)
+++ trunk/wp-admin/options.php 2010-12-19 05:36:11 UTC (rev 17056)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
</span><span class="cx"> 'privacy' => array( 'blog_public' ),
</span><span class="cx"> 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
</span><del>- 'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
</del><ins>+ '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' ),
</ins><span class="cx"> 'options' => array( '' ) );
</span><span class="cx">
</span><span class="cx"> $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (17055 => 17056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-12-19 05:23:25 UTC (rev 17055)
+++ trunk/wp-includes/version.php 2010-12-19 05:36:11 UTC (rev 17056)
</span><span class="lines">@@ -8,14 +8,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.1-beta2-16997';
</del><ins>+$wp_version = '3.1-beta2-17056';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 15477;
</del><ins>+$wp_db_version = 17056;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>