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

Timestamp:

11/30/2012 02:03:47 PM (12 years ago)

Author:

ryan

Message:

Add a create_posts check to _wp_translate_postdata(). Move the edit_post check to the top of the function.

Props nacin
fixes #22417

File:

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

trunk/wp-admin/includes/post.php

@@ -26 +26 @@
     if ( $update )
         $post_data['ID'] = (int) $post_data['post_ID'];
+
+    $ptype = get_post_type_object( $post_data['post_type'] );
+
+    if ( $update && ! current_user_can( $ptype->cap->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
+            return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+    } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
+        if ( 'page' == $post_data['post_type'] )
+            return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+        else
+            return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+    }
 
     if ( isset( $post_data['content'] ) )
@@ -52 +66 @@
     }
 
-    $ptype = get_post_type_object( $post_data['post_type'] );
-    if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) {
-        if ( $update ) {
-            if ( ! current_user_can( $ptype->cap->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 {
-                    return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
-                }
-            }
-        } else {
-            if ( ! current_user_can( $ptype->cap->edit_others_posts )  ) {
-                if ( 'page' == $post_data['post_type'] ) {
-                    return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-                } else {
-                    return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
-                }
-            }
-        }
+    if ( ! $update && isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
+         && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
+
+        if ( 'page' == $post_data['post_type'] )
+            return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+        else
+            return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
     }