Changeset 12927 for trunk/wp-admin/edit.php

Timestamp:

02/02/2010 05:37:03 PM (17 years ago)

Author:

ryan

Message:

Allow customizing capabilities for custom post types. Always check caps against those in the post type object instead of contructing them manually. see #9674

File:

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

trunk/wp-admin/edit.php

@@ -28 +28 @@
 
 $post_type_object = get_post_type_object($post_type);
-$post_type_cap = $post_type_object->capability_type;
 
 if ( 'post' != $post_type ) {
@@ -73 +72 @@
                         $trashed = 0;
                         foreach( (array) $post_ids as $post_id ) {
-                                if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+                                if ( !current_user_can($post_type_object->delete_cap, $post_id) )
                                         wp_die( __('You are not allowed to move this item to the trash.') );
 
@@ -86 +85 @@
                         $untrashed = 0;
                         foreach( (array) $post_ids as $post_id ) {
-                                if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+                                if ( !current_user_can($post_type_object->delete_cap, $post_id) )
                                         wp_die( __('You are not allowed to restore this item from the trash.') );
 
@@ -101 +100 @@
                                 $post_del = & get_post($post_id);
 
-                                if ( !current_user_can('delete_' .  $post_type_cap, $post_id) )
+                                if ( !current_user_can($post_type_object->delete_cap, $post_id) )
                                         wp_die( __('You are not allowed to delete this item.') );
 
@@ -142 +141 @@
 
 $user_posts = false;
-if ( !current_user_can('edit_others_' . $post_type_cap . 's') ) {
+if ( !current_user_can($post_type_object->edit_others_cap) ) {
         $user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = '%s' AND post_status != 'trash' AND post_author = %d", $post_type, $current_user->ID) );
         $user_posts = true;
@@ -342 +341 @@
 <?php }
 
-if ( $is_trash && current_user_can('edit_others_' . $post_type_cap .'s') ) { ?>
+if ( $is_trash && current_user_can($post_type_object->edit_others_cap) ) { ?>
 <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
@@ -389 +388 @@
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash && current_user_can('edit_others_' . $post_type_cap . 's') ) { ?>
+<?php if ( $is_trash && current_user_can($post_type_object->edit_others_cap) ) { ?>
 <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>