Ticket #14206: 14206.diff

wp-admin/edit-form-advanced.php

@@ -140 +140 @@
 
 // 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;
 
         $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_callback, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
 
 if ( post_type_supports($post_type, 'page-attributes') )

wp-includes/taxonomy.php

@@ -388 +388 @@
         $args['labels'] = get_taxonomy_labels( (object) $args );
         $args['label'] = $args['labels']->name;
 
+        if ( empty( $args['meta_box_callback'] ) ) {
+                if ( $args['hierarchical'] ) {
+                        $args['meta_box_callback'] = 'post_categories_meta_box';
+                } else {
+                        $args['meta_box_callback'] = 'post_tags_meta_box';
+                }
+        }
+
         $wp_taxonomies[$taxonomy] = (object) $args;
 
         // register callback handling for metabox