Changeset 14130 for trunk/wp-admin/includes/post.php

Timestamp:

04/18/2010 04:26:39 AM (15 years ago)

Author:

dd32

Message:

Update _wp_translate_postdata() capability checks to use Post Type API capability fields. Props duck_. Fixes #12987

File:

• trunk/wp-admin/includes/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -45 +45 @@
     }
 
+    $ptype = get_post_type_object( $post_data['post_type'] );
     if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) {
-        if ( 'page' == $post_data['post_type'] ) {
-            if ( !current_user_can( 'edit_others_pages' ) ) {
+        if ( !current_user_can( $ptype->edit_others_cap ) ) {
+            if ( 'page' == $post_data['post_type'] ) {
                 return new WP_Error( 'edit_others_pages', $update ?
                     __( 'You are not allowed to edit pages as this user.' ) :
                     __( 'You are not allowed to create pages as this user.' )
                 );
-            }
-        } else {
-            if ( !current_user_can( 'edit_others_posts' ) ) {
+            } else {
                 return new WP_Error( 'edit_others_posts', $update ?
                     __( 'You are not allowed to edit posts as this user.' ) :
@@ -83 +82 @@
     // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
     // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-    if ( isset( $post_data['post_type'] ) && 'page' == $post_data['post_type'] ) {
-        $publish_cap = 'publish_pages';
-        $edit_cap = 'edit_published_pages';
-    } else {
-        $publish_cap = 'publish_posts';
-        $edit_cap = 'edit_published_posts';
-    }
-    if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $publish_cap )) )
-        if ( $previous_status != 'publish' || !current_user_can( $edit_cap ) )
+    if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->publish_cap )) )
+        if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) )
             $post_data['post_status'] = 'pending';