Index: wp-admin/async-upload.php =================================================================== --- wp-admin/async-upload.php (revision 23303) +++ wp-admin/async-upload.php (working copy) @@ -47,8 +47,7 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id $post = get_post( $id ); if ( 'attachment' != $post->post_type ) wp_die( __( 'Unknown post type.' ) ); - $post_type_object = get_post_type_object( 'attachment' ); - if ( ! current_user_can( $post_type_object->cap->edit_post, $id ) ) + if ( ! current_user_can( 'edit_post', $id ) ) wp_die( __( 'You are not allowed to edit this item.' ) ); switch ( $_REQUEST['fetch'] ) { Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 23303) +++ wp-admin/edit.php (working copy) @@ -77,7 +77,7 @@ if ( $doaction ) { case 'trash': $trashed = 0; foreach( (array) $post_ids as $post_id ) { - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id) ) wp_die( __('You are not allowed to move this item to the Trash.') ); if ( !wp_trash_post($post_id) ) @@ -90,7 +90,7 @@ if ( $doaction ) { case 'untrash': $untrashed = 0; foreach( (array) $post_ids as $post_id ) { - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id) ) wp_die( __('You are not allowed to restore this item from the Trash.') ); if ( !wp_untrash_post($post_id) ) @@ -105,7 +105,7 @@ if ( $doaction ) { foreach( (array) $post_ids as $post_id ) { $post_del = get_post($post_id); - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id ) ) wp_die( __('You are not allowed to delete this item.') ); if ( $post_del->post_type == 'attachment' ) { Index: wp-admin/includes/class-wp-posts-list-table.php =================================================================== --- wp-admin/includes/class-wp-posts-list-table.php (revision 23303) +++ wp-admin/includes/class-wp-posts-list-table.php (working copy) @@ -471,7 +471,7 @@ class WP_Posts_List_Table extends WP_List_Table { $edit_link = get_edit_post_link( $post->ID ); $title = _draft_or_post_title(); $post_type_object = get_post_type_object( $post->post_type ); - $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID ); + $can_edit_post = current_user_can( 'edit_post', $post->ID ); $alternate = 'alternate' == $alternate ? '' : 'alternate'; $classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' ); @@ -545,7 +545,7 @@ class WP_Posts_List_Table extends WP_List_Table { $actions['edit'] = '' . __( 'Edit' ) . ''; $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; } - if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) { + if ( current_user_can( 'delete_post', $post->ID ) ) { if ( 'trash' == $post->post_status ) $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; elseif ( EMPTY_TRASH_DAYS ) Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 23303) +++ wp-admin/includes/media.php (working copy) @@ -445,9 +445,8 @@ function media_upload_form_handler() { if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) { $post = $_post = get_post($attachment_id, ARRAY_A); - $post_type_object = get_post_type_object( $post[ 'post_type' ] ); - if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) ) + if ( !current_user_can( 'edit_post', $attachment_id ) ) continue; if ( isset($attachment['post_content']) ) Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 23303) +++ wp-admin/includes/post.php (working copy) @@ -28,7 +28,7 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { $ptype = get_post_type_object( $post_data['post_type'] ); - if ( $update && ! current_user_can( $ptype->cap->edit_post, $post_data['ID'] ) ) { + if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) { if ( 'page' == $post_data['post_type'] ) return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) ); else @@ -161,7 +161,7 @@ function edit_post( $post_data = null ) { $post_data['post_mime_type'] = $post->post_mime_type; $ptype = get_post_type_object($post_data['post_type']); - if ( !current_user_can( $ptype->cap->edit_post, $post_ID ) ) { + if ( !current_user_can( 'edit_post', $post_ID ) ) { if ( 'page' == $post_data['post_type'] ) wp_die( __('You are not allowed to edit this page.' )); else @@ -356,7 +356,7 @@ function bulk_edit_posts( $post_data = null ) { foreach ( $post_IDs as $post_ID ) { $post_type_object = get_post_type_object( get_post_type( $post_ID ) ); - if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( $post_type_object->cap->edit_post, $post_ID ) ) { + if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( 'edit_post', $post_ID ) ) { $skipped[] = $post_ID; continue; } Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 23303) +++ wp-admin/includes/template.php (working copy) @@ -244,7 +244,7 @@ function wp_link_category_checklist( $link_id = 0 ) { */ function get_inline_data($post) { $post_type_object = get_post_type_object($post->post_type); - if ( ! current_user_can($post_type_object->cap->edit_post, $post->ID) ) + if ( ! current_user_can( 'edit_post', $post->ID ) ) return; $title = esc_textarea( trim( $post->post_title ) ); Index: wp-admin/post.php =================================================================== --- wp-admin/post.php (revision 23303) +++ wp-admin/post.php (working copy) @@ -141,7 +141,7 @@ case 'edit': if ( null == $post_type_object ) wp_die( __('Unknown post type.') ); - if ( !current_user_can($post_type_object->cap->edit_post, $post_id) ) + if ( !current_user_can( 'edit_post', $post_id ) ) wp_die( __('You are not allowed to edit this item.') ); if ( 'trash' == $post->post_status ) @@ -214,7 +214,7 @@ case 'trash': $post = get_post($post_id); - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id ) ) wp_die( __('You are not allowed to move this item to the Trash.') ); if ( ! wp_trash_post($post_id) ) @@ -227,7 +227,7 @@ case 'trash': case 'untrash': check_admin_referer('untrash-post_' . $post_id); - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id ) ) wp_die( __('You are not allowed to move this item out of the Trash.') ); if ( ! wp_untrash_post($post_id) ) @@ -240,7 +240,7 @@ case 'untrash': case 'delete': check_admin_referer('delete-post_' . $post_id); - if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) + if ( !current_user_can( 'delete_post', $post_id ) ) wp_die( __('You are not allowed to delete this item.') ); $force = !EMPTY_TRASH_DAYS; Index: wp-includes/admin-bar.php =================================================================== --- wp-includes/admin-bar.php (revision 23303) +++ wp-includes/admin-bar.php (working copy) @@ -429,7 +429,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { if ( 'post' == $current_screen->base && 'add' != $current_screen->action && ( $post_type_object = get_post_type_object( $post->post_type ) ) - && current_user_can( $post_type_object->cap->read_post, $post->ID ) + && current_user_can( 'read_post', $post->ID ) && ( $post_type_object->public ) && ( $post_type_object->show_in_admin_bar ) ) { @@ -457,7 +457,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { if ( ! empty( $current_object->post_type ) && ( $post_type_object = get_post_type_object( $current_object->post_type ) ) - && current_user_can( $post_type_object->cap->edit_post, $current_object->ID ) + && current_user_can( 'edit_post', $current_object->ID ) && $post_type_object->show_ui && $post_type_object->show_in_admin_bar ) { $wp_admin_bar->add_menu( array( Index: wp-includes/class-wp-xmlrpc-server.php =================================================================== --- wp-includes/class-wp-xmlrpc-server.php (revision 23303) +++ wp-includes/class-wp-xmlrpc-server.php (working copy) @@ -1007,7 +1007,7 @@ class wp_xmlrpc_server extends IXR_Server { if ( $update ) { if ( ! get_post( $post_data['ID'] ) ) return new IXR_Error( 401, __( 'Invalid post ID.' ) ); - if ( ! current_user_can( $post_type->cap->edit_post, $post_data['ID'] ) ) + if ( ! current_user_can( 'edit_post', $post_data['ID'] ) ) return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) ); if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) ) return new IXR_Error( 401, __( 'The post type may not be changed.' ) ); @@ -1317,8 +1317,7 @@ class wp_xmlrpc_server extends IXR_Server { if ( empty( $post['ID'] ) ) return new IXR_Error( 404, __( 'Invalid post ID.' ) ); - $post_type = get_post_type_object( $post['post_type'] ); - if ( ! current_user_can( $post_type->cap->delete_post, $post_id ) ) + if ( ! current_user_can( 'delete_post', $post_id ) ) return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) ); $result = wp_delete_post( $post_id ); @@ -1399,8 +1398,7 @@ class wp_xmlrpc_server extends IXR_Server { if ( empty( $post['ID'] ) ) return new IXR_Error( 404, __( 'Invalid post ID.' ) ); - $post_type = get_post_type_object( $post['post_type'] ); - if ( ! current_user_can( $post_type->cap->edit_post, $post_id ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) ); return $this->_prepare_post( $post, $fields ); @@ -1495,8 +1493,7 @@ class wp_xmlrpc_server extends IXR_Server { $struct = array(); foreach ( $posts_list as $post ) { - $post_type = get_post_type_object( $post['post_type'] ); - if ( ! current_user_can( $post_type->cap->edit_post, $post['ID'] ) ) + if ( ! current_user_can( 'edit_post', $post['ID'] ) ) continue; $struct[] = $this->_prepare_post( $post, $fields ); Index: wp-includes/link-template.php =================================================================== --- wp-includes/link-template.php (revision 23303) +++ wp-includes/link-template.php (working copy) @@ -905,7 +905,7 @@ function get_edit_post_link( $id = 0, $context = 'display' ) { if ( !$post_type_object ) return; - if ( !current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) + if ( !current_user_can( 'edit_post', $post->ID ) ) return; return apply_filters( 'get_edit_post_link', admin_url( sprintf($post_type_object->_edit_link . $action, $post->ID) ), $post->ID, $context ); @@ -959,7 +959,7 @@ function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false if ( !$post_type_object ) return; - if ( !current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) + if ( !current_user_can( 'delete_post', $post->ID ) ) return; $action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';