Ticket #26409: 26409.diff

wp-admin/includes/meta-boxes.php

@@ -386 +386 @@
         extract( wp_parse_args($args, $defaults), EXTR_SKIP );
         $tax_name = esc_attr($taxonomy);
         $taxonomy = get_taxonomy($taxonomy);
-        $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
         $comma = _x( ',', 'tag delimiter' );
+
+        if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
 ?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
         <div class="jaxtag">
         <div class="nojs-tags hide-if-js">
         <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
-        <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
-        <?php if ( $user_can_assign_terms ) : ?>
+        <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>"><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
         <div class="ajaxtag hide-if-no-js">
                 <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
                 <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
@@ -402 +402 @@
                 <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
         </div>
         <p class="howto"><?php echo $taxonomy->labels->separate_items_with_commas; ?></p>
-        <?php endif; ?>
         </div>
         <div class="tagchecklist"></div>
 </div>
-<?php if ( $user_can_assign_terms ) : ?>
 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
-<?php endif; ?>
 <?php
+        endif;
 }
 
 /**
@@ -428 +426 @@
         extract( wp_parse_args($args, $defaults), EXTR_SKIP );
         $tax = get_taxonomy($taxonomy);
 
+        if ( current_user_can( $tax->cap->assign_terms ) ) :
         ?>
         <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">
                 <ul id="<?php echo $taxonomy; ?>-tabs" class="category-tabs">
@@ -450 +449 @@
                                 <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
                         </ul>
                 </div>
-        <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
                         <div id="<?php echo $taxonomy; ?>-adder" class="wp-hidden-children">
                                 <h4>
                                         <a id="<?php echo $taxonomy; ?>-add-toggle" href="#<?php echo $taxonomy; ?>-add" class="hide-if-no-js">
@@ -472 +470 @@
                                         <span id="<?php echo $taxonomy; ?>-ajax-response"></span>
                                 </p>
                         </div>
-                <?php endif; ?>
         </div>
         <?php
+        endif;
 }
 
 /**