Changeset 13729

Timestamp:

03/17/2010 12:35:48 PM (16 years ago)

Author:

dd32

Message:

post_type edit_cap and edit_type_cap awareness for wp-admin/includes/post.php

File:

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

trunk/wp-admin/includes/post.php

@@ -146 +146 @@
         $post_ID = (int) $post_data['post_ID'];
 
-        if ( 'page' == $post_data['post_type'] ) {
-                if ( !current_user_can( 'edit_page', $post_ID ) )
+        $ptype = get_post_type_object($post_data['post_type']);
+        if ( !current_user_can( $ptype->edit_cap, $post_ID ) ) {
+                if ( 'page' == $post_data['post_type'] )
                         wp_die( __('You are not allowed to edit this page.' ));
-        } else {
-                if ( !current_user_can( 'edit_post', $post_ID ) )
+                else
                         wp_die( __('You are not allowed to edit this post.' ));
         }
@@ -237 +237 @@
                 $post_data = &$_POST;
 
-        if ( isset($post_data['post_type']) && 'page' == $post_data['post_type'] ) {
-                if ( ! current_user_can( 'edit_pages' ) )
-                        wp_die( __('You are not allowed to edit pages.') );
-        } else {
-                if ( ! current_user_can( 'edit_posts' ) )
-                        wp_die( __('You are not allowed to edit posts.') );
+        if ( isset($post_data['post_type']) )
+                $ptype = get_post_type_object($post_data['post_type']);
+        else
+                $ptype = get_post_type_object('post');
+
+        if ( !current_user_can( $ptype->edit_type_cap, $post_ID ) ) {
+                if ( 'page' == $ptype->name )
+                        wp_die( __('You are not allowed to edit pages.'));
+                else
+                        wp_die( __('You are not allowed to edit posts.'));
         }
 
@@ -483 +487 @@
         global $user_ID;
 
-        if ( isset( $_POST['post_type'] ) && 'page' == $_POST['post_type'] ) {
-                if ( !current_user_can( 'edit_pages' ) )
+
+        if ( isset($_POST['post_type']) )
+                $ptype = get_post_type_object($_POST['post_type']);
+        else
+                $ptype = get_post_type_object('post');
+
+        if ( !current_user_can( $ptype->edit_type_cap, $post_ID ) ) {
+                if ( 'page' == $ptype->name )
                         return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) );
-        } else {
-                if ( !current_user_can( 'edit_posts' ) )
+                else
                         return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) );
         }