<!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>[16251] trunk: Introduce menu_name label for taxonomies and post types.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16251">16251</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-09 02:09:00 +0000 (Tue, 09 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce menu_name label for taxonomies and post types. Defaults to name. fixes <a href="http://trac.wordpress.org/ticket/14832">#14832</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<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="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (16250 => 16251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-11-09 01:20:38 UTC (rev 16250)
+++ trunk/wp-admin/menu.php 2010-11-09 02:09:00 UTC (rev 16251)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array('post', (array) $tax->object_type, true) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
</del><ins>+ $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
</ins><span class="cx"> }
</span><span class="cx"> unset($tax);
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page' );
</del><ins>+ $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=page' );
</ins><span class="cx"> }
</span><span class="cx"> unset($tax);
</span><span class="cx">
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
</span><span class="cx"> $ptype_menu_position++;
</span><span class="cx">
</span><del>- $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
- $submenu["edit.php?post_type=$ptype"][5] = array( $ptype_obj->labels->name, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
</del><ins>+ $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
+ $submenu["edit.php?post_type=$ptype"][5] = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
</ins><span class="cx"> $submenu["edit.php?post_type=$ptype"][10] = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
</span><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array($ptype, (array) $tax->object_type, true) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
</del><ins>+ $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i);
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16250 => 16251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-11-09 01:20:38 UTC (rev 16250)
+++ trunk/wp-includes/post.php 2010-11-09 02:09:00 UTC (rev 16251)
</span><span class="lines">@@ -1142,8 +1142,9 @@
</span><span class="cx"> 'search_items' => array( __('Search Posts'), __('Search Pages') ),
</span><span class="cx"> 'not_found' => array( __('No posts found.'), __('No pages found.') ),
</span><span class="cx"> 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
</span><del>- 'parent_item_colon' => array( null, __('Parent Page:') )
</del><ins>+ 'parent_item_colon' => array( null, __('Parent Page:') ),
</ins><span class="cx"> );
</span><ins>+ $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
</ins><span class="cx"> return _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16250 => 16251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-09 01:20:38 UTC (rev 16250)
+++ trunk/wp-includes/taxonomy.php 2010-11-09 02:09:00 UTC (rev 16251)
</span><span class="lines">@@ -403,6 +403,7 @@
</span><span class="cx"> 'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
</span><span class="cx"> 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
</span><span class="cx"> );
</span><ins>+ $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
</ins><span class="cx">
</span><span class="cx"> return _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>