Ticket #13972: 13972.4.patch

wp-admin/includes/meta-boxes.php

@@ -396 +396 @@
 
                 <div id="<?php echo $taxonomy; ?>-all" class="tabs-panel">
                         <?php
-            $name = ( $taxonomy == 'category' ) ? 'post_category' : 'tax_input[' . $taxonomy . ']';
-            echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-            ?>
+                        $name = ( $taxonomy == 'category' ) ? 'post_category' : 'tax_input[' . $taxonomy . ']';
+                        echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+                        ?>
                         <ul id="<?php echo $taxonomy; ?>checklist" data-wp-lists="list:<?php echo $taxonomy?>" class="categorychecklist form-no-clear">
                                 <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
                         </ul>
                 </div>
-        <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
+                <?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">
@@ -723 +723 @@
  * @param object $link
  */
 function link_categories_meta_box($link) {
+        $taxonomy = get_taxonomy( 'link_category' );
 ?>
 <div id="taxonomy-linkcategory" class="categorydiv">
         <ul id="category-tabs" class="category-tabs">
@@ -747 +748 @@
                 </ul>
         </div>
 
-        <div id="category-adder" class="wp-hidden-children">
-                <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
-                <p id="link-category-add" class="wp-hidden-child">
-                        <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-                        <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-                        <input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
-                        <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
-                        <span id="category-ajax-response"></span>
-                </p>
-        </div>
+        <?php if ( current_user_can( $taxonomy->cap->manage_terms ) ) : ?>
+                <div id="category-adder" class="wp-hidden-children">
+                        <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+                        <p id="link-category-add" class="wp-hidden-child">
+                                <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+                                <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
+                                <input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
+                                <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+                                <span id="category-ajax-response"></span>
+                        </p>
+                </div>
+        <?php endif; ?>
 </div>
 <?php
 }