Changeset 12833 for trunk/wp-admin/edit-tags.php

Timestamp:

01/26/2010 11:32:04 AM (15 years ago)

Author:

dd32

Message:

First scratch at Taxonomy Capabilities. See #12035

File:

• trunk/wp-admin/edit-tags.php (modified) (10 diffs)

trunk/wp-admin/edit-tags.php

@@ -19 +19 @@
 if ( !is_taxonomy($taxonomy) )
     wp_die(__('Invalid taxonomy'));
+
+$tax = get_taxonomy($taxonomy);
 
 if ( empty($post_type) || !in_array( $post_type, get_post_types( array('_show' => true) ) ) )
@@ -40 +42 @@
     check_admin_referer('add-tag');
 
-    if ( !current_user_can('manage_categories') )
+    if ( !current_user_can($tax->edit_cap) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -61 +63 @@
     check_admin_referer('delete-tag_' .  $tag_ID);
 
-    if ( !current_user_can('manage_categories') )
+    if ( !current_user_can($tax->delete_cap) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -81 +83 @@
     check_admin_referer('bulk-tags');
 
-    if ( !current_user_can('manage_categories') )
+    if ( !current_user_can($tax->delete_cap) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -116 +118 @@
     check_admin_referer('update-tag_' . $tag_ID);
 
-    if ( !current_user_can('manage_categories') )
+    if ( !current_user_can($tax->edit_cap) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -143 +145 @@
 }
 
-$can_manage = current_user_can('manage_categories');
-
 wp_enqueue_script('admin-tags');
-if ( $can_manage )
+if ( current_user_can($tax->edit_cap) )
     wp_enqueue_script('inline-edit-tax');
 
@@ -250 +250 @@
 
     <tbody id="the-list" class="list:tag">
-<?php
-
-$count = tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy );
-?>
+<?php tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy ); ?>
     </tbody>
 </table>
@@ -285 +282 @@
 <h3><?php _e('Popular Tags'); ?></h3>
 <?php
-if ( $can_manage )
+if ( current_user_can($tax->edit_cap) )
     wp_tag_cloud(array('taxonomy' => $taxonomy, 'link' => 'edit'));
 else
@@ -292 +289 @@
 </div>
 
-<?php if ( $can_manage ) {
-    do_action('add_tag_form_pre'); ?>
+<?php if ( current_user_can($tax->edit_cap) ) {
+    do_action('add_tag_form_pre', $taxonomy); ?>
 
 <div class="form-wrap">
@@ -328 +325 @@
 
 <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
-<?php do_action('add_tag_form'); ?>
+<?php do_action('add_tag_form', $taxonomy); ?>
 </form></div>
 <?php } ?>