<!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>[25572] trunk/src: Introduce a meta_box_cb argument 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/25572">25572</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-23 17:11:09 +0000 (Mon, 23 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a meta_box_cb argument for register_taxonomy().
The specified callback function is used as the meta box callback for the taxonomy.
props garyc40, helen.
fixes <a href="http://core.trac.wordpress.org/ticket/14206">#14206</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.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="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (25571 => 25572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php 2013-09-23 16:17:59 UTC (rev 25571)
+++ trunk/src/wp-admin/edit-form-advanced.php 2013-09-23 17:11:09 UTC (rev 25572)
</span><span class="lines">@@ -140,16 +140,18 @@
</span><span class="cx">
</span><span class="cx"> // all taxonomies
</span><span class="cx"> foreach ( get_object_taxonomies( $post ) as $tax_name ) {
</span><del>- $taxonomy = get_taxonomy($tax_name);
</del><ins>+ $taxonomy = get_taxonomy( $tax_name );
</ins><span class="cx"> if ( ! $taxonomy->show_ui )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $label = $taxonomy->labels->name;
</span><span class="cx">
</span><del>- if ( !is_taxonomy_hierarchical($tax_name) )
- add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
</del><ins>+ if ( ! is_taxonomy_hierarchical( $tax_name ) )
+ $tax_meta_box_id = 'tagsdiv-' . $tax_name;
</ins><span class="cx"> else
</span><del>- add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
</del><ins>+ $tax_meta_box_id = $tax_name . 'div';
+
+ add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( post_type_supports($post_type, 'page-attributes') )
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (25571 => 25572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2013-09-23 16:17:59 UTC (rev 25571)
+++ trunk/src/wp-includes/post.php 2013-09-23 17:11:09 UTC (rev 25572)
</span><span class="lines">@@ -1139,8 +1139,8 @@
</span><span class="cx"> * - map_meta_cap - Whether to use the internal default meta capability handling. Defaults to false.
</span><span class="cx"> * - supports - An alias for calling add_post_type_support() directly. Defaults to title and editor.
</span><span class="cx"> * * See {@link add_post_type_support()} for documentation.
</span><del>- * - register_meta_box_cb - Provide a callback function that will be called when setting up the
- * meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
</del><ins>+ * - register_meta_box_cb - Provide a callback function that sets up the meta boxes
+ * for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
</ins><span class="cx"> * - taxonomies - An array of taxonomy identifiers that will be registered for the post type.
</span><span class="cx"> * * Default is no taxonomies.
</span><span class="cx"> * * Taxonomies can be registered later with register_taxonomy() or register_taxonomy_for_object_type().
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (25571 => 25572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-09-23 16:17:59 UTC (rev 25571)
+++ trunk/src/wp-includes/taxonomy.php 2013-09-23 17:11:09 UTC (rev 25572)
</span><span class="lines">@@ -289,6 +289,8 @@
</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="cx"> * * If not set, the default is inherited from show_ui.
</span><ins>+ * - meta_box_cb - Provide a callback function for the meta box display. Defaults to
+ * post_categories_meta_box for hierarchical taxonomies and post_tags_meta_box for non-hierarchical.
</ins><span class="cx"> * - capabilities - Array of capabilities for this taxonomy.
</span><span class="cx"> * * You can see accepted values in this function.
</span><span class="cx"> * - rewrite - Triggers the handling of rewrites for this taxonomy. Defaults to true, using $taxonomy as slug.
</span><span class="lines">@@ -332,6 +334,7 @@
</span><span class="cx"> 'show_in_menu' => null,
</span><span class="cx"> 'show_in_nav_menus' => null,
</span><span class="cx"> 'show_tagcloud' => null,
</span><ins>+ 'meta_box_cb' => null,
</ins><span class="cx"> 'capabilities' => array(),
</span><span class="cx"> 'rewrite' => true,
</span><span class="cx"> 'query_var' => $taxonomy,
</span><span class="lines">@@ -401,6 +404,14 @@
</span><span class="cx"> $args['labels'] = get_taxonomy_labels( (object) $args );
</span><span class="cx"> $args['label'] = $args['labels']->name;
</span><span class="cx">
</span><ins>+ // If not set, use the default meta box
+ if ( null === $args['meta_box_cb'] ) {
+ if ( $args['hierarchical'] )
+ $args['meta_box_cb'] = 'post_categories_meta_box';
+ else
+ $args['meta_box_cb'] = 'post_tags_meta_box';
+ }
+
</ins><span class="cx"> $wp_taxonomies[ $taxonomy ] = (object) $args;
</span><span class="cx">
</span><span class="cx"> // register callback handling for metabox
</span></span></pre>
</div>
</div>
</body>
</html>