<!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>[14432] trunk/wp-includes: Clean up whitespace in status/PT/
tax registration.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14432">14432</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-04 06:13:28 +0000 (Tue, 04 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up whitespace in status/PT/tax registration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14431 => 14432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-04 05:48:08 UTC (rev 14431)
+++ trunk/wp-includes/post.php 2010-05-04 06:13:28 UTC (rev 14432)
</span><span class="lines">@@ -15,112 +15,125 @@
</span><span class="cx"> * Creates the initial post types when 'init' action is fired.
</span><span class="cx"> */
</span><span class="cx"> function create_initial_post_types() {
</span><del>- register_post_type( 'post', array( 'label' => __('Posts'),
- 'singular_label' => __('Post'),
- 'public' => true,
- 'show_ui' => false,
- '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
- '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
- 'capability_type' => 'post',
- 'hierarchical' => false,
- 'rewrite' => false,
- 'query_var' => false,
- 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions')
- ) );
</del><ins>+ register_post_type( 'post', array(
+ 'label' => __( 'Posts' ),
+ 'singular_label' => __( 'Post' ),
+ 'public' => true,
+ 'show_ui' => false,
+ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+ '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
+ 'capability_type' => 'post',
+ 'hierarchical' => false,
+ 'rewrite' => false,
+ 'query_var' => false,
+ 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_type( 'page', array( 'label' => __('Pages'),
- 'singular_label' => __('Page'),
- 'public' => true,
- 'show_ui' => false,
- '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
- '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
- 'capability_type' => 'page',
- 'hierarchical' => true,
- 'rewrite' => false,
- 'query_var' => false,
- 'supports' => array('title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions')
- ) );
</del><ins>+ register_post_type( 'page', array(
+ 'label' => __( 'Pages' ),
+ 'singular_label' => __( 'Page' ),
+ 'public' => true,
+ 'show_ui' => false,
+ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+ '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
+ 'capability_type' => 'page',
+ 'hierarchical' => true,
+ 'rewrite' => false,
+ 'query_var' => false,
+ 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_type( 'attachment', array('label' => __('Media'),
- 'public' => true,
- 'show_ui' => false,
- '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
- '_edit_link' => 'media.php?attachment_id=%d', /* internal use only. don't use this when registering your own post type. */
- 'capability_type' => 'post',
- 'hierarchical' => false,
- 'rewrite' => false,
- 'query_var' => false,
- ) );
</del><ins>+ register_post_type( 'attachment', array(
+ 'label' => __( 'Media' ),
+ 'public' => true,
+ 'show_ui' => false,
+ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+ '_edit_link' => 'media.php?attachment_id=%d', /* internal use only. don't use this when registering your own post type. */
+ 'capability_type' => 'post',
+ 'hierarchical' => false,
+ 'rewrite' => false,
+ 'query_var' => false,
+ ) );
</ins><span class="cx">
</span><del>- register_post_type( 'revision', array( 'label' => __('Revisions'),
- 'singular_label' => __('Revision'),
- 'public' => false,
- '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
- '_edit_link' => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */
- 'capability_type' => 'post',
- 'hierarchical' => false,
- 'rewrite' => false,
- 'query_var' => false,
- ) );
</del><ins>+ register_post_type( 'revision', array(
+ 'label' => __( 'Revisions' ),
+ 'singular_label' => __( 'Revision' ),
+ 'public' => false,
+ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+ '_edit_link' => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */
+ 'capability_type' => 'post',
+ 'hierarchical' => false,
+ 'rewrite' => false,
+ 'query_var' => false,
+ ) );
</ins><span class="cx">
</span><del>- register_post_type( 'nav_menu_item', array( 'label' => __('Navigation Menu Items'),
- 'singular_label' => __('Navigation Menu Item'),
- 'public' => false,
- 'show_ui' => false,
- '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
- 'capability_type' => 'post',
- 'hierarchical' => false,
- 'rewrite' => false,
- 'query_var' => false,
- ) );
</del><ins>+ register_post_type( 'nav_menu_item', array(
+ 'label' => __( 'Navigation Menu Items' ),
+ 'singular_label' => __( 'Navigation Menu Item' ),
+ 'public' => false,
+ 'show_ui' => false,
+ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+ 'capability_type' => 'post',
+ 'hierarchical' => false,
+ 'rewrite' => false,
+ 'query_var' => false,
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'publish', array( 'label' => _x('Published', 'post'),
- 'public' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'publish', array(
+ 'label' => _x( 'Published', 'post' ),
+ 'public' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'future', array( 'label' => _x('Scheduled', 'post'),
- 'protected' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'future', array(
+ 'label' => _x( 'Scheduled', 'post' ),
+ 'protected' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'draft', array( 'label' => _x('Draft', 'post'),
- 'protected' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'draft', array(
+ 'label' => _x( 'Draft', 'post' ),
+ 'protected' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'pending', array( 'label' => _x('Pending', 'post'),
- 'protected' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'pending', array(
+ 'label' => _x( 'Pending', 'post' ),
+ 'protected' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'private', array( 'label' => _x('Private', 'post'),
- 'private' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'private', array(
+ 'label' => _x( 'Private', 'post' ),
+ 'private' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'trash', array( 'label' => _x('Trash', 'post'),
- 'internal' => true,
- 'show_in_admin_status_list' => true,
- '_builtin' => true, /* internal use only. */
- 'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>')
- ) );
</del><ins>+ register_post_status( 'trash', array(
+ 'label' => _x( 'Trash', 'post' ),
+ 'internal' => true,
+ '_builtin' => true, /* internal use only. */
+ 'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+ 'show_in_admin_status_list' => true,
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'auto-draft', array( 'label' => 'auto-draft',
- 'internal' => true,
- '_builtin' => true, /* internal use only. */
- ) );
</del><ins>+ register_post_status( 'auto-draft', array(
+ 'label' => 'auto-draft',
+ 'internal' => true,
+ '_builtin' => true, /* internal use only. */
+ ) );
</ins><span class="cx">
</span><del>- register_post_status( 'inherit', array( 'label' => 'inherit',
- 'internal' => true,
- 'exclude_from_search' => false,
- '_builtin' => true, /* internal use only. */
- ) );
</del><ins>+ register_post_status( 'inherit', array(
+ 'label' => 'inherit',
+ 'internal' => true,
+ '_builtin' => true, /* internal use only. */
+ 'exclude_from_search' => false,
+ ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14431 => 14432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-05-04 05:48:08 UTC (rev 14431)
+++ trunk/wp-includes/taxonomy.php 2010-05-04 06:13:28 UTC (rev 14432)
</span><span class="lines">@@ -15,46 +15,49 @@
</span><span class="cx"> * Creates the initial taxonomies when 'init' action is fired.
</span><span class="cx"> */
</span><span class="cx"> function create_initial_taxonomies() {
</span><del>- register_taxonomy( 'category', 'post', array( 'hierarchical' => true,
- 'update_count_callback' => '_update_post_term_count',
- 'label' => __('Categories'),
- 'singular_label' => __('Category'),
- 'query_var' => false,
- 'rewrite' => false,
- 'public' => true,
- 'show_ui' => true,
- '_builtin' => true
- ) ) ;
</del><ins>+ register_taxonomy( 'category', 'post', array(
+ 'hierarchical' => true,
+ 'update_count_callback' => '_update_post_term_count',
+ 'label' => __( 'Categories' ),
+ 'singular_label' => __( 'Category' ),
+ 'query_var' => false,
+ 'rewrite' => false,
+ 'public' => true,
+ 'show_ui' => true,
+ '_builtin' => true,
+ ) ) ;
</ins><span class="cx">
</span><span class="cx"> register_taxonomy( 'post_tag', 'post', array(
</span><del>- 'hierarchical' => false,
- 'update_count_callback' => '_update_post_term_count',
- 'label' => __('Post Tags'),
- 'singular_label' => __('Post Tag'),
- 'query_var' => false,
- 'rewrite' => false,
- 'public' => true,
- 'show_ui' => true,
- '_builtin' => true
- ) ) ;
</del><ins>+ 'hierarchical' => false,
+ 'update_count_callback' => '_update_post_term_count',
+ 'label' => __( 'Post Tags' ),
+ 'singular_label' => __( 'Post Tag' ),
+ 'query_var' => false,
+ 'rewrite' => false,
+ 'public' => true,
+ 'show_ui' => true,
+ '_builtin' => true,
+ ) );
</ins><span class="cx">
</span><del>- register_taxonomy( 'nav_menu', 'nav_menu_item', array( 'hierarchical' => false,
- 'label' => __('Navigation Menus'),
- 'singular_label' => __('Navigation Menu'),
- 'query_var' => false,
- 'rewrite' => false,
- 'show_ui' => false,
- '_builtin' => true,
- ) ) ;
</del><ins>+ register_taxonomy( 'nav_menu', 'nav_menu_item', array(
+ 'hierarchical' => false,
+ 'label' => __( 'Navigation Menus' ),
+ 'singular_label' => __( 'Navigation Menu' ),
+ 'query_var' => false,
+ 'rewrite' => false,
+ 'show_ui' => false,
+ '_builtin' => true,
+ ) ) ;
</ins><span class="cx">
</span><del>- register_taxonomy( 'link_category', 'link', array( 'hierarchical' => false,
- 'label' => __('Categories'),
- 'query_var' => false,
- 'rewrite' => false,
- 'public' => false,
- 'show_ui' => false,
- '_builtin' => true,
- ) ) ;
</del><ins>+ register_taxonomy( 'link_category', 'link', array(
+ 'hierarchical' => false,
+ 'label' => __( 'Categories' ),
+ 'query_var' => false,
+ 'rewrite' => false,
+ 'public' => false,
+ 'show_ui' => false,
+ '_builtin' => true,
+ ) ) ;
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>