<!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" />
<title>[18261] trunk/wp-includes: Introduce name_admin_bar label and the show_in_admin_bar (Add New menu) argument for post types.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18261">18261</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-06-11 02:20:18 +0000 (Sat, 11 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce name_admin_bar label and the show_in_admin_bar (Add New menu) argument for post types. Allows for proper translations of these strings and provides for consolidated logic. fixes <a href="http://trac.wordpress.org/ticket/16406">#16406</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18260 => 18261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-06-11 00:55:48 UTC (rev 18260)
+++ trunk/wp-includes/admin-bar.php 2011-06-11 02:20:18 UTC (rev 18261)
</span><span class="lines">@@ -238,11 +238,11 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
</span><span class="cx"> $actions = array();
</span><del>- foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) {
- if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
</del><ins>+ foreach ( (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' ) as $ptype_obj ) {
+ if ( ! current_user_can( $ptype_obj->cap->edit_posts ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
</del><ins>+ $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->name_admin_bar, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'upload_files' ) )
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (18260 => 18261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-06-11 00:55:48 UTC (rev 18260)
+++ trunk/wp-includes/post.php 2011-06-11 02:20:18 UTC (rev 18261)
</span><span class="lines">@@ -18,6 +18,9 @@
</span><span class="cx"> */
</span><span class="cx"> function create_initial_post_types() {
</span><span class="cx"> register_post_type( 'post', array(
</span><ins>+ 'labels' => array(
+ 'name_admin_bar' => _x( 'Post', 'add new on admin bar' ),
+ ),
</ins><span class="cx"> 'public' => true,
</span><span class="cx"> '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
</span><span class="cx"> '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
</span><span class="lines">@@ -30,6 +33,9 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> register_post_type( 'page', array(
</span><ins>+ 'labels' => array(
+ 'name_admin_bar' => _x( 'Page', 'add new on admin bar' ),
+ ),
</ins><span class="cx"> 'public' => true,
</span><span class="cx"> 'publicly_queryable' => false,
</span><span class="cx"> '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
</span><span class="lines">@@ -915,7 +921,8 @@
</span><span class="cx"> 'public' => false, 'rewrite' => true, 'has_archive' => false, 'query_var' => true,
</span><span class="cx"> 'supports' => array(), 'register_meta_box_cb' => null,
</span><span class="cx"> 'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null,
</span><del>- 'permalink_epmask' => EP_PERMALINK, 'can_export' => true, 'show_in_nav_menus' => null, 'show_in_menu' => null,
</del><ins>+ 'permalink_epmask' => EP_PERMALINK, 'can_export' => true,
+ 'show_in_nav_menus' => null, 'show_in_menu' => null, 'show_in_admin_bar' => null,
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args = (object) $args;
</span><span class="lines">@@ -938,6 +945,10 @@
</span><span class="cx"> if ( null === $args->show_in_menu || ! $args->show_ui )
</span><span class="cx"> $args->show_in_menu = $args->show_ui;
</span><span class="cx">
</span><ins>+ // If not set, default to the whether the full UI is shown.
+ if ( null === $args->show_in_admin_bar )
+ $args->show_in_admin_bar = true === $args->show_in_menu;
+
</ins><span class="cx"> // Whether to show this type in nav-menus.php. Defaults to the setting for public.
</span><span class="cx"> if ( null === $args->show_in_nav_menus )
</span><span class="cx"> $args->show_in_nav_menus = $args->public;
</span><span class="lines">@@ -1194,6 +1205,9 @@
</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 class="cx">
</span><ins>+ if ( ! isset( $object->labels['name_admin_bar'] ) )
+ $object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+
</ins><span class="cx"> if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
</span><span class="cx"> $object->labels['menu_name'] = $object->labels['name'];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>