Index: wp-includes/taxonomy.php =================================================================== --- wp-includes/taxonomy.php (revision 20037) +++ wp-includes/taxonomy.php (working copy) @@ -43,73 +43,80 @@ register_taxonomy( 'category', 'post', array( 'hierarchical' => true, - 'query_var' => 'category_name', - 'rewrite' => $rewrite['category'], - 'public' => true, - 'show_ui' => true, - '_builtin' => true, + 'query_var' => 'category_name', + 'rewrite' => $rewrite['category'], + 'public' => true, + 'show_ui' => true, + '_builtin' => true, + 'input' => 'checkbox', ) ); register_taxonomy( 'post_tag', 'post', array( - 'hierarchical' => false, - 'query_var' => 'tag', - 'rewrite' => $rewrite['post_tag'], - 'public' => true, - 'show_ui' => true, - '_builtin' => true, + 'hierarchical' => false, + 'query_var' => 'tag', + 'rewrite' => $rewrite['post_tag'], + 'public' => true, + 'show_ui' => true, + '_builtin' => true, + 'input' => 'text', ) ); register_taxonomy( 'nav_menu', 'nav_menu_item', array( - 'public' => false, - 'hierarchical' => false, - 'labels' => array( - 'name' => __( 'Navigation Menus' ), - 'singular_name' => __( 'Navigation Menu' ), + 'public' => false, + 'hierarchical' => false, + 'labels' => array( + 'name' => __( 'Navigation Menus' ), + 'singular_name' => __( 'Navigation Menu' ), ), - 'query_var' => false, - 'rewrite' => false, - 'show_ui' => false, - '_builtin' => true, + 'query_var' => false, + 'rewrite' => false, + 'show_ui' => false, + '_builtin' => true, 'show_in_nav_menus' => false, + 'input' => null, ) ); register_taxonomy( 'link_category', 'link', array( - 'hierarchical' => false, - 'labels' => array( - 'name' => __( 'Link Categories' ), - 'singular_name' => __( 'Link Category' ), - 'search_items' => __( 'Search Link Categories' ), - 'popular_items' => null, - 'all_items' => __( 'All Link Categories' ), - 'edit_item' => __( 'Edit Link Category' ), - 'update_item' => __( 'Update Link Category' ), - 'add_new_item' => __( 'Add New Link Category' ), - 'new_item_name' => __( 'New Link Category Name' ), + 'hierarchical' => false, + 'labels' => array( + 'name' => __( 'Link Categories' ), + 'singular_name' => __( 'Link Category' ), + 'search_items' => __( 'Search Link Categories' ), + 'popular_items' => null, + 'all_items' => __( 'All Link Categories' ), + 'edit_item' => __( 'Edit Link Category' ), + 'update_item' => __( 'Update Link Category' ), + 'add_new_item' => __( 'Add New Link Category' ), + 'new_item_name' => __( 'New Link Category Name' ), 'separate_items_with_commas' => null, - 'add_or_remove_items' => null, - 'choose_from_most_used' => null, + 'add_or_remove_items' => null, + 'choose_from_most_used' => null, ), - 'query_var' => false, - 'rewrite' => false, - 'public' => false, - 'show_ui' => false, - '_builtin' => true, + 'query_var' => false, + 'rewrite' => false, + 'public' => false, + 'show_ui' => false, + '_builtin' => true, + 'input' => null, ) ); register_taxonomy( 'post_format', 'post', array( - 'public' => true, - 'hierarchical' => false, - 'labels' => array( - 'name' => _x( 'Format', 'post format' ), - 'singular_name' => _x( 'Format', 'post format' ), + 'public' => true, + 'hierarchical' => false, + 'labels' => array( + 'name' => _x( 'Format', 'post format' ), + 'singular_name' => _x( 'Format', 'post format' ), ), - 'query_var' => true, - 'rewrite' => $rewrite['post_format'], - 'show_ui' => false, - '_builtin' => true, + 'query_var' => true, + 'rewrite' => $rewrite['post_format'], + 'show_ui' => false, + '_builtin' => true, 'show_in_nav_menus' => current_theme_supports( 'post-formats' ), + 'input' => null, ) ); + } + add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority /** @@ -292,6 +299,8 @@ * * labels - An array of labels for this taxonomy. You can see accepted values in {@link get_taxonomy_labels()}. By default tag labels are used for non-hierarchical types and category labels for hierarchical ones. * + * input - the type of metabox to display on the post edit screen. Choices include text (tags), checkbox (categories), radio (exclusive), or dropdown (exclusive). Note: exclusive inputs limit the user to selecting only one term. + * * @package WordPress * @subpackage Taxonomy * @since 2.3.0 @@ -308,18 +317,21 @@ if ( ! is_array($wp_taxonomies) ) $wp_taxonomies = array(); - $defaults = array( 'hierarchical' => false, + $defaults = array( + 'hierarchical' => false, 'update_count_callback' => '', - 'rewrite' => true, - 'query_var' => $taxonomy, - 'public' => true, - 'show_ui' => null, - 'show_tagcloud' => null, - '_builtin' => false, - 'labels' => array(), - 'capabilities' => array(), - 'show_in_nav_menus' => null, + 'rewrite' => true, + 'query_var' => $taxonomy, + 'public' => true, + 'show_ui' => null, + 'show_tagcloud' => null, + '_builtin' => false, + 'labels' => array(), + 'capabilities' => array(), + 'show_in_nav_menus' => null, + 'input' => 'input', ); + $args = wp_parse_args($args, $defaults); if ( false !== $args['query_var'] && !empty($wp) ) { @@ -348,6 +360,10 @@ if ( is_null($args['show_ui']) ) $args['show_ui'] = $args['public']; + + //if no input is specified and UI is not used, set default to null to avoid confusion + if ( !$args['show_ui'] && is_null( $args['input'] ) ) + $args['input'] = null; // Whether to show this type in nav-menus.php. Defaults to the setting for public. if ( null === $args['show_in_nav_menus'] ) @@ -1881,7 +1897,7 @@ $object_ids = array($object_ids); $object_ids = array_map('intval', $object_ids); - $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all'); + $defaults = array( 'orderby' => 'name', 'order' => 'ASC', 'fields' => 'all' ); $args = wp_parse_args( $args, $defaults ); $terms = array(); @@ -2146,6 +2162,10 @@ if ( ! taxonomy_exists($taxonomy) ) return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); + + //if this is an exclusive taxonomy, and users has passed more than 1 term, only accept the first + if ( is_array( $terms ) && in_array( get_taxonomy( $taxonomy )->input, array( 'dropdown', 'radio' ) ) ) + $terms = array_shift( $terms ); if ( !is_array($terms) ) $terms = array($terms); Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 20037) +++ wp-includes/post.php (working copy) @@ -2410,7 +2410,7 @@ * @param bool $wp_error Optional. Allow return of WP_Error on failure. * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success. */ -function wp_insert_post($postarr, $wp_error = false) { +function wp_insert_post($postarr, $wp_error = false) { global $wpdb, $user_ID; $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID, @@ -2611,10 +2611,18 @@ if ( !empty($tax_input) ) { foreach ( $tax_input as $taxonomy => $tags ) { $taxonomy_obj = get_taxonomy($taxonomy); - if ( is_array($tags) ) // array = hierarchical, string = non-hierarchical. + + // array = hierarchical, string = non-hierarchical. + if ( is_array($tags) ) $tags = array_filter($tags); + + //exclusive taxonomies pass IDs rather than slugs, typecast to prevent confusion + if ( $taxonomy_obj->input == 'radio' || $taxonomy_obj->input == 'dropdown' ) + $tags = array( (int) $tags ); + if ( current_user_can($taxonomy_obj->cap->assign_terms) ) wp_set_post_terms( $post_ID, $tags, $taxonomy ); + } } Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 20037) +++ wp-admin/includes/template.php (working copy) @@ -40,9 +40,13 @@ $name = 'post_category'; else $name = 'tax_input['.$taxonomy.']'; - + + //if this is not a radio input, each checkbox should be individually named with []'s + if ( $input != 'radio' ) + $name .= '[]'; + $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : ''; - $output .= "\n
  • " . ''; + $output .= "\n
  • " . ''; } function end_el( &$output, $category, $depth = 0, $args = array() ) { @@ -87,7 +91,7 @@ 'popular_cats' => false, 'walker' => null, 'taxonomy' => 'category', - 'checked_ontop' => true + 'checked_ontop' => true, ); extract( wp_parse_args($args, $defaults), EXTR_SKIP ); @@ -120,6 +124,12 @@ } else { $categories = (array) get_terms($taxonomy, array('get' => 'all')); } + + //set input type + if ( $tax->input == 'radio' ) + $args['input'] = 'radio'; + else + $args['input'] = 'checkbox'; if ( $checked_ontop ) { // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache) Index: wp-admin/includes/meta-boxes.php =================================================================== --- wp-admin/includes/meta-boxes.php (revision 20037) +++ wp-admin/includes/meta-boxes.php (working copy) @@ -232,51 +232,44 @@ } /** - * Display post format form elements. - * - * @since 3.1.0 - * + * Renders metabox for a given taxonomy + * Taxonomy should be passed via the initial filter as an argument within the box array + * @since 3.4 * @param object $post + * @param array $box */ -function post_format_meta_box( $post, $box ) { - if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) : - $post_formats = get_theme_support( 'post-formats' ); +function post_taxonomy_meta_box( $post, $box ) { - if ( is_array( $post_formats[0] ) ) : - $post_format = get_post_format( $post->ID ); - if ( !$post_format ) - $post_format = '0'; - // Add in the current one if it isn't there yet, in case the current theme doesn't support it - if ( $post_format && !in_array( $post_format, $post_formats[0] ) ) - $post_formats[0][] = $post_format; - ?> -
    - /> - -
    /> -
    -
    - input}_taxonomy_meta_box" ) ) + call_user_func( "_{$taxonomy->input}_taxonomy_meta_box", $post, $taxonomy ); + else + do_action( '{$taxonomy->input}_taxonomy_meta_box', $post, $taxonomy ); + } /** - * Display post tags form fields. - * - * @since 2.6.0 - * - * @param object $post + * Help function to render text (tag-like) input taxonomy metaboxes + * @param object $post the post object + * @param object $taxonomy the taxonomy object + * @since 3.4 */ -function post_tags_meta_box($post, $box) { - $defaults = array('taxonomy' => 'post_tag'); - if ( !isset($box['args']) || !is_array($box['args']) ) - $args = array(); - else - $args = $box['args']; - extract( wp_parse_args($args, $defaults), EXTR_SKIP ); - $tax_name = esc_attr($taxonomy); - $taxonomy = get_taxonomy($taxonomy); +function _text_taxonomy_meta_box( $post, $taxonomy ) { + + $tax_name = esc_attr( $taxonomy->name ); $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : ''; $comma = _x( ',', 'tag delimiter' ); + ?>
    @@ -295,78 +288,248 @@
    -cap->assign_terms) ) : ?> +cap->assign_terms ) ) : ?>

    labels->choose_from_most_used; ?>

    - - 'category'); - if ( !isset($box['args']) || !is_array($box['args']) ) - $args = array(); - else - $args = $box['args']; - extract( wp_parse_args($args, $defaults), EXTR_SKIP ); - $tax = get_taxonomy($taxonomy); - - ?> -
    -