<!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>[25133] trunk/src: Introduce show_in_menu for register_taxonomy.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://core.trac.wordpress.org/changeset/25133">25133</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-08-26 22:34:56 +0000 (Mon, 26 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce show_in_menu for register_taxonomy.
Accepts boolean: true to show, false to hide. If not set, the default is inherited from show_ui.
fixes <a href="http://core.trac.wordpress.org/ticket/20930">#20930</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu.php (25132 => 25133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu.php 2013-08-26 21:23:58 UTC (rev 25132)
+++ trunk/src/wp-admin/menu.php 2013-08-26 22:34:56 UTC (rev 25133)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
</span><del>- if ( ! $tax->show_ui || ! in_array('post', (array) $tax->object_type, true) )
</del><ins>+ if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> /* translators: add new file */
</span><span class="cx"> $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
</span><span class="cx"> foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
</span><del>- if ( ! $tax->show_ui )
</del><ins>+ if ( ! $tax->show_ui || ! $tax->show_in_menu )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=attachment' );
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
</span><del>- if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )
</del><ins>+ if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('page', (array) $tax->object_type, true) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=page' );
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
</span><del>- if ( ! $tax->show_ui || ! in_array($ptype, (array) $tax->object_type, true) )
</del><ins>+ if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php (25132 => 25133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2013-08-26 21:23:58 UTC (rev 25132)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2013-08-26 22:34:56 UTC (rev 25133)
</span><span class="lines">@@ -547,6 +547,9 @@
</span><span class="cx"> if ( in_array( 'cap', $fields ) )
</span><span class="cx"> $_taxonomy['cap'] = (array) $taxonomy->cap;
</span><span class="cx">
</span><ins>+ if ( in_array( 'menu', $fields ) )
+ $_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+
</ins><span class="cx"> if ( in_array( 'object_type', $fields ) )
</span><span class="cx"> $_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (25132 => 25133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-08-26 21:23:58 UTC (rev 25132)
+++ trunk/src/wp-includes/taxonomy.php 2013-08-26 22:34:56 UTC (rev 25133)
</span><span class="lines">@@ -280,6 +280,11 @@
</span><span class="cx"> * - hierarchical - Whether the taxonomy is hierarchical (e.g. category). Defaults to false.
</span><span class="cx"> * - show_ui -Whether to generate a default UI for managing this taxonomy in the admin.
</span><span class="cx"> * * If not set, the default is inherited from public.
</span><ins>+ * - show_in_menu - Where to show the taxonomy in the admin menu.
+ * * If true, the taxonomy is shown as a submenu of the object type menu.
+ * * If false, no menu is shown.
+ * * show_ui must be true.
+ * * If not set, the default is inherited from show_ui.
</ins><span class="cx"> * - show_in_nav_menus - Makes this taxonomy available for selection in navigation menus.
</span><span class="cx"> * * If not set, the default is inherited from public.
</span><span class="cx"> * - show_tagcloud - Whether to list the taxonomy in the Tag Cloud Widget.
</span><span class="lines">@@ -324,6 +329,7 @@
</span><span class="cx"> 'public' => true,
</span><span class="cx"> 'hierarchical' => false,
</span><span class="cx"> 'show_ui' => null,
</span><ins>+ 'show_in_menu' => null,
</ins><span class="cx"> 'show_in_nav_menus' => null,
</span><span class="cx"> 'show_tagcloud' => null,
</span><span class="cx"> 'capabilities' => array(),
</span><span class="lines">@@ -366,6 +372,10 @@
</span><span class="cx"> if ( null === $args['show_ui'] )
</span><span class="cx"> $args['show_ui'] = $args['public'];
</span><span class="cx">
</span><ins>+ // If not set, default to the setting for show_ui.
+ if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
+ $args['show_in_menu' ] = $args['show_ui'];
+
</ins><span class="cx"> // If not set, default 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></pre>
</div>
</div>
</body>
</html>