<!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>[14619] trunk/wp-includes: Keep label as a quick way to set up a taxonomy/
post type, without diving into the labels array.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14619">14619</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-05-14 02:13:49 +0000 (Fri, 14 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Keep label as a quick way to set up a taxonomy/post type, without diving into the labels array. Deprecate singular_label while there. Props nacin. Fixes <a href="http://trac.wordpress.org/ticket/13357">#13357</a></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 (14618 => 14619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-14 01:54:21 UTC (rev 14618)
+++ trunk/wp-includes/post.php 2010-05-14 02:13:49 UTC (rev 14619)
</span><span class="lines">@@ -771,6 +771,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Optional $args contents:
</span><span class="cx"> *
</span><ins>+ * - label - Name of the post type shown in the menu. Usually plural. If not set, labels['name'] will be used.
</ins><span class="cx"> * - description - A short descriptive summary of what the post type is. Defaults to blank.
</span><span class="cx"> * - public - Whether posts of this type should be shown in the admin UI. Defaults to false.
</span><span class="cx"> * - exclude_from_search - Whether to exclude posts with this post type from search results. Defaults to true if the type is not public, false if the type is public.
</span><span class="lines">@@ -869,11 +870,7 @@
</span><span class="cx"> add_action('add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1);
</span><span class="cx">
</span><span class="cx"> $args->labels = get_post_type_labels( $args );
</span><del>-
- // we keep these two only for backwards compatibility
- // TODO: remove in 3.1
</del><span class="cx"> $args->label = $args->labels->name;
</span><del>- $args->singular_label = $args->labels->singular_name;
</del><span class="cx">
</span><span class="cx"> $wp_post_types[$post_type] = $args;
</span><span class="cx">
</span><span class="lines">@@ -920,7 +917,7 @@
</span><span class="cx"> * Builds an object with all post type labels out of a post type object
</span><span class="cx"> *
</span><span class="cx"> * Accepted keys of the label array in the post type object:
</span><del>- * - name - general name for the post type, usually plural. Default is Posts/Pages
</del><ins>+ * - name - general name for the post type, usually plural. The same and overriden by $post_type_object->label. Default is Posts/Pages
</ins><span class="cx"> * - singular_name - name for one object of this post type. Default is Post/Page
</span><span class="cx"> * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: <code>_x('Add New', 'product');</code>
</span><span class="cx"> * - add_new_item - Default is Add New Post/Add New Page
</span><span class="lines">@@ -965,15 +962,9 @@
</span><span class="cx"> */
</span><span class="cx"> function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
</span><span class="cx">
</span><del>- // try to get missing (singular_)?name from older style (singular_)?label member variables
- // we keep that for backwards compatibility
- // TODO: remove in 3.1
- if ( !isset( $object->labels['name'] ) && isset( $object->label ) ) {
</del><ins>+ if ( isset( $object->label ) ) {
</ins><span class="cx"> $object->labels['name'] = $object->label;
</span><span class="cx"> }
</span><del>- if ( !isset( $object->labels['singular_name'] ) && isset( $object->singular_label ) ) {
- $object->labels['singular_name'] = $object->singular_label;
- }
</del><span class="cx">
</span><span class="cx"> if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
</span><span class="cx"> $object->labels['singular_name'] = $object->labels['name'];
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14618 => 14619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-05-14 01:54:21 UTC (rev 14618)
+++ trunk/wp-includes/taxonomy.php 2010-05-14 02:13:49 UTC (rev 14619)
</span><span class="lines">@@ -210,6 +210,8 @@
</span><span class="cx"> * whether taxonomy exists.
</span><span class="cx"> *
</span><span class="cx"> * Optional $args contents:
</span><ins>+ *
+ * label - Name of the taxonomy shown in the menu. Usually plural. If not set, labels['name'] will be used.
</ins><span class="cx"> *
</span><span class="cx"> * hierarchical - has some defined purpose at other parts of the API and is a
</span><span class="cx"> * boolean value.
</span><span class="lines">@@ -297,12 +299,9 @@
</span><span class="cx">
</span><span class="cx"> $args['name'] = $taxonomy;
</span><span class="cx"> $args['object_type'] = (array) $object_type;
</span><ins>+
</ins><span class="cx"> $args['labels'] = get_taxonomy_labels( (object) $args );
</span><del>-
- // we keep these two only for backwards compatibility
- // TODO: remove in 3.1
</del><span class="cx"> $args['label'] = $args['labels']->name;
</span><del>- $args['singular_label'] = $args['labels']->singular_name;
</del><span class="cx">
</span><span class="cx"> $wp_taxonomies[$taxonomy] = (object) $args;
</span><span class="cx">
</span><span class="lines">@@ -314,7 +313,7 @@
</span><span class="cx"> * Builds an object with all taxonomy labels out of a taxonomy object
</span><span class="cx"> *
</span><span class="cx"> * Accepted keys of the label array in the taxonomy object:
</span><del>- * - name - general name for the taxonomy, usually plural. Default is Post Tags/Categories
</del><ins>+ * - name - general name for the taxonomy, usually plural. The same as and overriden by $tax->label. Default is Post Tags/Categories
</ins><span class="cx"> * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
</span><span class="cx"> * - search_items - Default is Search Tags/Search Categories
</span><span class="cx"> * - popular_items - Default is Popular Tags/Popular Categories
</span></span></pre>
</div>
</div>
</body>
</html>