Ticket #16714: 16714.11.diff

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

@@ -1016 +1016 @@
                         if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
                                 return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
                 } else {
-                        if ( ! current_user_can( $post_type->cap->edit_posts ) )
+                        if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
                                 return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
                 }
 
@@ -3928 +3928 @@
                 do_action('xmlrpc_call', 'blogger.newPost');
 
                 $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-                if ( !current_user_can($cap) )
+                if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
                         return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
 
                 $post_status = ($publish) ? 'publish' : 'draft';
@@ -4143 +4143 @@
                         $post_type = 'post';
                 }
 
+                if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
                 if ( !current_user_can( $cap ) )
                         return new IXR_Error( 401, $error_message );
 

wp-includes/capabilities.php

@@ -1060 +1060 @@
                                 $caps[] = $post_type->cap->delete_private_posts;
                 }
                 break;
-        // current_user_can( 'create_posts', $post_type )
-        case 'create_posts':
-                $post_type = isset( $args[0] ) ? $args[0] : 'post';
-                $post_type_object = get_post_type_object( $post_type );
-
-                $caps[] = $post_type_object->cap->create_posts;
-
-                break;
                 // edit_post breaks down to edit_posts, edit_published_posts, or
                 // edit_others_posts
         case 'edit_post':

wp-admin/index.php

@@ -76 +76 @@
         $help .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
 if ( current_user_can( 'publish_posts' ) )
         $help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-if ( current_user_can( 'create_posts' ) ) {
+if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
         $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
         $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
 }

wp-admin/menu.php

@@ -49 +49 @@
 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
         $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
         /* translators: add new post */
-        $submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'create_posts', 'post-new.php' );
+        $submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
 
         $i = 15;
         foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
@@ -81 +81 @@
 $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'none' );
         $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
         /* translators: add new page */
-        $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
+        $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
         $i = 15;
         foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
                 if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )

wp-admin/press-this.php

@@ -13 +13 @@
 
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
-if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( 'create_posts' ) )
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object('post')->cap->create_posts ) )
         wp_die( __( 'Cheatin’ uh?' ) );
 
 /**