<!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>[15056] trunk: Use show_in_nav_menus for attachments.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15056">15056</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-29 16:46:46 +0000 (Sat, 29 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use show_in_nav_menus for attachments. Also add it to register_taxonomy for consistency and have it default to public, not show_ui, like post types. see <a href="http://trac.wordpress.org/ticket/13621">#13621</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-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="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (15055 => 15056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-05-29 16:35:24 UTC (rev 15055)
+++ trunk/wp-admin/includes/nav-menu.php 2010-05-29 16:46:46 UTC (rev 15056)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_taxonomy_meta_boxes() {
</span><del>- $taxonomies = get_taxonomies( array( 'show_ui' => true ), 'object' );
</del><ins>+ $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
</ins><span class="cx">
</span><span class="cx"> if ( !$taxonomies )
</span><span class="cx"> return;
</span><span class="lines">@@ -952,9 +952,6 @@
</span><span class="cx"> */
</span><span class="cx"> function _wp_nav_menu_meta_box_object( $object = null ) {
</span><span class="cx"> if ( isset( $object->name ) ) {
</span><del>- // don't show media meta box
- if ( 'attachment' == $object->name )
- return false;
</del><span class="cx">
</span><span class="cx"> if ( 'page' == $object->name ) {
</span><span class="cx"> $object->_default_query = array(
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15055 => 15056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-29 16:35:24 UTC (rev 15055)
+++ trunk/wp-includes/post.php 2010-05-29 16:46:46 UTC (rev 15056)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> 'rewrite' => false,
</span><span class="cx"> 'query_var' => false,
</span><span class="cx"> 'can_export' => false,
</span><ins>+ 'show_in_nav_menus' => false,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> register_post_type( 'revision', array(
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15055 => 15056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-05-29 16:35:24 UTC (rev 15055)
+++ trunk/wp-includes/taxonomy.php 2010-05-29 16:46:46 UTC (rev 15056)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> 'rewrite' => false,
</span><span class="cx"> 'show_ui' => false,
</span><span class="cx"> '_builtin' => true,
</span><ins>+ 'show_in_nav_menus' => false,
</ins><span class="cx"> ) ) ;
</span><span class="cx">
</span><span class="cx"> register_taxonomy( 'link_category', 'link', array(
</span><span class="lines">@@ -232,6 +233,9 @@
</span><span class="cx"> * show_ui - If the WordPress UI admin tags UI should apply to this taxonomy;
</span><span class="cx"> * defaults to public.
</span><span class="cx"> *
</span><ins>+ * show_in_nav_menus - true makes this taxonomy available for selection in navigation menus.
+ * Defaults to public.
+ *
</ins><span class="cx"> * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
</span><span class="cx"> * defaults to show_ui which defalts to public.
</span><span class="cx"> *
</span><span class="lines">@@ -264,6 +268,7 @@
</span><span class="cx"> '_builtin' => false,
</span><span class="cx"> 'labels' => array(),
</span><span class="cx"> 'capabilities' => array(),
</span><ins>+ 'show_in_nav_menus' => null,
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx">
</span><span class="lines">@@ -286,6 +291,10 @@
</span><span class="cx"> if ( is_null($args['show_ui']) )
</span><span class="cx"> $args['show_ui'] = $args['public'];
</span><span class="cx">
</span><ins>+ // Whether to show this type in nav-menus.php. Defaults to the setting for public.
+ if ( null === $args['show_in_nav_menus'] )
+ $args['show_in_nav_menus'] = $args['public'];
+
</ins><span class="cx"> if ( is_null($args['show_tagcloud']) )
</span><span class="cx"> $args['show_tagcloud'] = $args['show_ui'];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>