Changeset 14593 for trunk/wp-admin/includes/meta-boxes.php

Timestamp:

05/13/2010 04:10:17 AM (16 years ago)

Author:

nacin

Message:

Move taxonomy object properties for capabilities into a cap object. Capabilities can be specified via capabilities (an array keyed by the generic cap name) for register_taxonomy. fixes #13358.

File:

• trunk/wp-admin/includes/meta-boxes.php (modified) (4 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -250 +250 @@
         $help_cloud = isset( $taxonomy->help_cloud ) ? $taxonomy->help_cloud        : __('Choose from the most used tags in %s');
 
-        $disabled = !current_user_can($taxonomy->assign_cap) ? 'disabled="disabled"' : '';
+        $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : '';
 ?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
@@ -257 +257 @@
         <p><?php echo $help_nojs; ?></p>
         <textarea name="<?php echo "tax_input[$tax_name]"; ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]" <?php echo $disabled; ?>><?php echo esc_attr(get_terms_to_edit( $post->ID, $tax_name )); ?></textarea></div>
-        <?php if ( current_user_can($taxonomy->assign_cap) ) : ?>
+        <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
         <div class="ajaxtag hide-if-no-js">
                 <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
@@ -269 +269 @@
         <div class="tagchecklist"></div>
 </div>
-<?php if ( current_user_can($taxonomy->assign_cap) ) : ?>
+<?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( $help_cloud, $box['title'] ); ?></a></p>
 <?php else : ?>
@@ -316 +316 @@
                         </ul>
                 </div>
-        <?php if ( !current_user_can($tax->assign_cap) ) : ?>
+        <?php if ( !current_user_can($tax->cap->assign_terms) ) : ?>
         <p><em><?php _e('You cannot modify this Taxonomy.'); ?></em></p>
         <?php endif; ?>
-        <?php if ( current_user_can($tax->edit_cap) ) : ?>
+        <?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" tabindex="3"><?php printf( __( '+ Add New %s' ), $tax->singular_label ); ?></a></h4>