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

Timestamp:

05/13/2010 04:10:17 AM (14 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/edit-tags.php (modified) (7 diffs)

trunk/wp-admin/edit-tags.php

@@ -42 +42 @@
     check_admin_referer('add-tag');
 
-    if ( !current_user_can($tax->edit_cap) )
+    if ( !current_user_can($tax->cap->edit_terms) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -80 +80 @@
     check_admin_referer('delete-tag_' .  $tag_ID);
 
-    if ( !current_user_can($tax->delete_cap) )
+    if ( !current_user_can($tax->cap->delete_terms) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -94 +94 @@
     check_admin_referer('bulk-tags');
 
-    if ( !current_user_can($tax->delete_cap) )
+    if ( !current_user_can($tax->cap->delete_terms) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -131 +131 @@
     check_admin_referer('update-tag_' . $tag_ID);
 
-    if ( !current_user_can($tax->edit_cap) )
+    if ( !current_user_can($tax->cap->edit_terms) )
         wp_die(__('Cheatin’ uh?'));
 
@@ -162 +162 @@
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->edit_cap) )
+if ( current_user_can($tax->cap->edit_terms) )
     wp_enqueue_script('inline-edit-tax');
 
@@ -319 +319 @@
 
 <?php
-if ( current_user_can( $tax->edit_cap ) )
+if ( current_user_can( $tax->cap->edit_terms ) )
     $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
 else
@@ -333 +333 @@
 endif;
 
-if ( current_user_can($tax->edit_cap) ) {
+if ( current_user_can($tax->cap->edit_terms) ) {
     if ( 'category' == $taxonomy )
         do_action('add_category_form_pre', (object)array('parent' => 0) );  // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form