Ticket #31917: ticket-31917.2.diff

wp-admin/includes/ajax-actions.php

@@ -1512 +1512 @@
                 if ( ! current_user_can( 'edit_page', $post_ID ) )
                         wp_die( __( 'You are not allowed to edit this page.' ) );
         } else {
-                if ( ! current_user_can( 'edit_post', $post_ID ) )
+                $post = get_post( $post_ID );
+                $post_type_object = get_post_type_object( $post->post_type );
+                if ( ! current_user_can( $post_type_object->cap->edit_posts, $post_ID ) )
                         wp_die( __( 'You are not allowed to edit this post.' ) );
         }
 

wp-admin/includes/class-wp-posts-list-table.php

@@ -645 +645 @@
                 $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( 'edit_post', $post->ID );
+                $can_edit_post = current_user_can( $post_type_object->cap->edit_posts, $post->ID );
 
                 $classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
 

wp-admin/includes/media.php

@@ -3039 +3039 @@
         if ( ! $parent_id ) {
                 return;
         }
-
-        if ( ! current_user_can( 'edit_post', $parent_id ) ) {
+        $post = get_post( $post_ID );
+        $post_type_object = get_post_type_object( $post->post_type );
+        if ( ! current_user_can( $post_type_object->cap->edit_posts, $parent_id ) ) {
                 wp_die( __( 'You are not allowed to edit this post.' ) );
         }
         $ids = array();
         foreach ( (array) $_REQUEST['media'] as $att_id ) {
                 $att_id = (int) $att_id;
 
-                if ( ! current_user_can( 'edit_post', $att_id ) ) {
+                if ( ! current_user_can( $post_type_object->cap->edit_posts, $att_id ) ) {
                         continue;
                 }
 

wp-admin/includes/post.php

@@ -28 +28 @@
 
         $ptype = get_post_type_object( $post_data['post_type'] );
 
-        if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
+        if ( $update && ! current_user_can( $ptype->cap->edit_posts, $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
@@ -199 +199 @@
         }
 
         $ptype = get_post_type_object($post_data['post_type']);
-        if ( !current_user_can( 'edit_post', $post_ID ) ) {
+        if ( !current_user_can( $ptype->cap->edit_posts, $post_ID ) ) {
                 if ( 'page' == $post_data['post_type'] )
                         wp_die( __('You are not allowed to edit this page.' ));
                 else
@@ -1660 +1660 @@
         if ( ! $post = get_post( $post_ID ) ) {
                 wp_die( __( 'You are not allowed to edit this post.' ) );
         }
-
-        if ( ! current_user_can( 'edit_post', $post->ID ) ) {
+        $post_type_object = get_post_type_object( $post->post_type );
+        if ( ! current_user_can( $post_type_object->cap->edit_posts, $post->ID ) ) {
                 wp_die( __( 'You are not allowed to edit this post.' ) );
         }
 

wp-admin/post.php

@@ -152 +152 @@
         if ( ! $post_type_object )
                 wp_die( __( 'Unknown post type.' ) );
 
-        if ( ! current_user_can( 'edit_post', $post_id ) )
+        if ( ! current_user_can( $post_type_object->cap->edit_posts, $post_id ) )
                 wp_die( __( 'You are not allowed to edit this item.' ) );
 
         if ( 'trash' == $post->post_status )

wp-includes/class-wp-xmlrpc-server.php

@@ -1174 +1174 @@
                 if ( $update ) {
                         if ( ! get_post( $post_data['ID'] ) )
                                 return new IXR_Error( 401, __( 'Invalid post ID.' ) );
-                        if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
+                        if ( ! current_user_can( $post_type->cap->edit_posts, $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.' ) );

wp-includes/link-template.php

@@ -1181 +1181 @@
         if ( !$post_type_object )
                 return;
 
-        if ( !current_user_can( 'edit_post', $post->ID ) )
+        if ( !current_user_can( $post_type_object->cap->edit_posts, $post->ID ) )
                 return;
 
         /**