Changeset 25572

Timestamp:

09/23/2013 05:11:09 PM (11 years ago)

Author:

nacin

Message:

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 #14206.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (3 diffs)

trunk/src/wp-admin/edit-form-advanced.php

@@ -141 +141 @@
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
-    $taxonomy = get_taxonomy($tax_name);
+    $taxonomy = get_taxonomy( $tax_name );
     if ( ! $taxonomy->show_ui )
         continue;
@@ -147 +147 @@
     $label = $taxonomy->labels->name;
 
-    if ( !is_taxonomy_hierarchical($tax_name) )
-        add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
+    if ( ! is_taxonomy_hierarchical( $tax_name ) )
+        $tax_meta_box_id = 'tagsdiv-' . $tax_name;
     else
-        add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
+        $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 ) );
 }
 

trunk/src/wp-includes/post.php

@@ -1140 +1140 @@
  * - supports - An alias for calling add_post_type_support() directly. Defaults to title and editor.
  *     * See {@link add_post_type_support()} for documentation.
- * - 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.
+ * - 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.
  * - taxonomies - An array of taxonomy identifiers that will be registered for the post type.
  *     * Default is no taxonomies.

trunk/src/wp-includes/taxonomy.php

@@ -290 +290 @@
  * - show_tagcloud - Whether to list the taxonomy in the Tag Cloud Widget.
  *     * If not set, the default is inherited from show_ui.
+ * - 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.
  * - capabilities - Array of capabilities for this taxonomy.
  *     * You can see accepted values in this function.
@@ -333 +335 @@
         'show_in_nav_menus'     => null,
         'show_tagcloud'         => null,
+        'meta_box_cb'           => null,
         'capabilities'          => array(),
         'rewrite'               => true,
@@ -401 +404 @@
     $args['labels'] = get_taxonomy_labels( (object) $args );
     $args['label'] = $args['labels']->name;
+
+    // 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';
+    }
 
     $wp_taxonomies[ $taxonomy ] = (object) $args;