Changeset 13289

Timestamp:

02/22/2010 08:36:32 AM (15 years ago)

Author:

dd32

Message:

Introduce assign_cap for Taxonomies, Defaults to 'edit_posts'. Allows for Authors/Contributors to tag/categorise their posts. See #12035

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -209 +209 @@
     $taxonomy = get_taxonomy(substr($action, 4));
     check_ajax_referer( $action );
-    if ( !current_user_can( $taxonomy->manage_cap ) )
+    if ( !current_user_can( $taxonomy->edit_cap ) )
         die('-1');
     $names = explode(',', $_POST['new'.$taxonomy->name]);

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

@@ -248 +248 @@
     $tax_name = esc_attr(substr($box['id'], 8));
     $taxonomy = get_taxonomy($tax_name);
-    if ( !current_user_can($taxonomy->manage_cap) ) // @todo: Display the terms, do not edit.
+    if ( !current_user_can($taxonomy->assign_cap) ) // @todo: Display the terms, do not edit.
         return;
     $helps = isset($taxonomy->helps) ? esc_attr($taxonomy->helps) : __('Separate tags with commas.');

trunk/wp-admin/includes/template.php

@@ -316 +316 @@
 
     $tax = get_taxonomy($taxonomy);
-    $args['disabled'] = !current_user_can($tax->manage_cap);
+    $args['disabled'] = !current_user_can($tax->assign_cap);
 
     if ( is_array( $selected_cats ) )
@@ -379 +379 @@
 
     $tax = get_taxonomy($taxonomy);
-    if ( ! current_user_can($tax->manage_cap) )
+    if ( ! current_user_can($tax->assign_cap) )
         $disabled = 'disabled="disabled"';
     else

trunk/wp-includes/post.php

@@ -2186 +2186 @@
         foreach ( $tax_input as $taxonomy => $tags ) {
             $taxonomy_obj = get_taxonomy($taxonomy);
-            if ( current_user_can($taxonomy_obj->manage_cap) )
+            if ( current_user_can($taxonomy_obj->assign_cap) )
                 wp_set_post_terms( $post_ID, $tags, $taxonomy );
         }

trunk/wp-includes/taxonomy.php

@@ -257 +257 @@
             $args[$cap] = 'manage_categories';
     }
+    if ( empty($args['assign_cap']) )
+        $args['assign_cap'] = 'edit_posts';
 
     if ( empty($args['singular_label']) )