<!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>[13216] trunk: First pass at giving taxonomies a show_ui param.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13216">13216</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-19 10:21:29 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at giving taxonomies a show_ui param. See <a href="http://trac.wordpress.org/ticket/10773">#10773</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.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 (13215 => 13216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-02-19 10:05:13 UTC (rev 13215)
+++ trunk/wp-admin/menu.php 2010-02-19 10:21:29 UTC (rev 13216)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( $wp_taxonomies as $tax ) {
</span><del>- if ( ! in_array('post', (array) $tax->object_type, true) )
</del><ins>+ if ( ! $tax->show_ui || ! 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->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name );
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( $wp_taxonomies as $tax ) {
</span><del>- if ( ! in_array($ptype, (array) $tax->object_type, true) )
</del><ins>+ if ( ! $tax->show_ui || ! 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->label), 'manage_categories', "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (13215 => 13216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-02-19 10:05:13 UTC (rev 13215)
+++ trunk/wp-includes/taxonomy.php 2010-02-19 10:21:29 UTC (rev 13216)
</span><span class="lines">@@ -20,7 +20,10 @@
</span><span class="cx"> 'label' => __('Categories'),
</span><span class="cx"> 'singular_label' => __('Category'),
</span><span class="cx"> 'query_var' => false,
</span><del>- 'rewrite' => false
</del><ins>+ 'rewrite' => false,
+ 'public' => true,
+ 'show_ui' => true,
+ '_builtin' => true
</ins><span class="cx"> ) ) ;
</span><span class="cx">
</span><span class="cx"> register_taxonomy( 'post_tag', 'post', array(
</span><span class="lines">@@ -29,13 +32,19 @@
</span><span class="cx"> 'label' => __('Post Tags'),
</span><span class="cx"> 'singular_label' => __('Post Tag'),
</span><span class="cx"> 'query_var' => false,
</span><del>- 'rewrite' => false
</del><ins>+ 'rewrite' => false,
+ 'public' => true,
+ 'show_ui' => true,
+ '_builtin' => true
</ins><span class="cx"> ) ) ;
</span><span class="cx">
</span><span class="cx"> register_taxonomy( 'link_category', 'link', array( 'hierarchical' => false,
</span><span class="cx"> 'label' => __('Categories'),
</span><span class="cx"> 'query_var' => false,
</span><del>- 'rewrite' => false
</del><ins>+ 'rewrite' => false,
+ 'public' => false,
+ 'show_ui' => false,
+ '_builtin' => true,
</ins><span class="cx"> ) ) ;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
</span><span class="lines">@@ -189,7 +198,14 @@
</span><span class="cx"> if ( ! is_array($wp_taxonomies) )
</span><span class="cx"> $wp_taxonomies = array();
</span><span class="cx">
</span><del>- $defaults = array('hierarchical' => false, 'update_count_callback' => '', 'rewrite' => true, 'query_var' => true);
</del><ins>+ $defaults = array( 'hierarchical' => false,
+ 'update_count_callback' => '',
+ 'rewrite' => true,
+ 'query_var' => $taxonomy,
+ 'public' => true,
+ 'show_ui' => null,
+ '_builtin' => false
+ );
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx">
</span><span class="cx"> if ( false !== $args['query_var'] && !empty($wp) ) {
</span><span class="lines">@@ -210,6 +226,9 @@
</span><span class="cx"> $wp_rewrite->add_permastruct($taxonomy, "/{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( is_null($args['show_ui']) )
+ $args['show_ui'] = $args['public'];
+
</ins><span class="cx"> foreach ( array('manage_cap', 'edit_cap', 'delete_cap') as $cap ) {
</span><span class="cx"> if ( empty($args[$cap]) )
</span><span class="cx"> $args[$cap] = 'manage_categories';
</span></span></pre>
</div>
</div>
</body>
</html>