Skip to content

Commit 5aac5cb

Browse files
nacinnacin
committed
Use the create_posts post type cap in more places. Remove the janky create_posts meta cap. see #16714.
git-svn-id: https://develop.svn.wordpress.org/trunk@22908 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 4e51b43 commit 5aac5cb

6 files changed

Lines changed: 12 additions & 15 deletions

File tree

‎wp-admin/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
$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>';
7777
if ( current_user_can( 'publish_posts' ) )
7878
$help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
79-
if ( current_user_can( 'create_posts' ) ) {
79+
if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
8080
$help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
8181
$help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
8282
}

‎wp-admin/menu.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
5050
$submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' );
5151
/* translators: add new post */
52-
$submenu['edit.php'][10] = array( _x('Add New', 'post'), 'create_posts', 'post-new.php' );
52+
$submenu['edit.php'][10] = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
5353

5454
$i = 15;
5555
foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
@@ -81,7 +81,7 @@
8181
$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'none' );
8282
$submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
8383
/* translators: add new page */
84-
$submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
84+
$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' );
8585
$i = 15;
8686
foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
8787
if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )

‎wp-admin/press-this.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
1515

16-
if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( 'create_posts' ) )
16+
if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) )
1717
wp_die( __( 'Cheatin&#8217; uh?' ) );
1818

1919
/**

‎wp-includes/admin-bar.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,16 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
363363
'href' => admin_url(),
364364
) );
365365

366-
if ( current_user_can( 'edit_posts' ) ) {
366+
if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
367367
$wp_admin_bar->add_menu( array(
368368
'parent' => $menu_id,
369369
'id' => $menu_id . '-n',
370370
'title' => __( 'New Post' ),
371371
'href' => admin_url( 'post-new.php' ),
372372
) );
373+
}
374+
375+
if ( current_user_can( 'edit_posts' ) ) {
373376
$wp_admin_bar->add_menu( array(
374377
'parent' => $menu_id,
375378
'id' => $menu_id . '-c',

‎wp-includes/capabilities.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,14 +1060,6 @@ function map_meta_cap( $cap, $user_id ) {
10601060
$caps[] = $post_type->cap->delete_private_posts;
10611061
}
10621062
break;
1063-
// current_user_can( 'create_posts', $post_type )
1064-
case 'create_posts':
1065-
$post_type = isset( $args[0] ) ? $args[0] : 'post';
1066-
$post_type_object = get_post_type_object( $post_type );
1067-
1068-
$caps[] = $post_type_object->cap->create_posts;
1069-
1070-
break;
10711063
// edit_post breaks down to edit_posts, edit_published_posts, or
10721064
// edit_others_posts
10731065
case 'edit_post':

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ protected function _insert_post( $user, $content_struct ) {
10161016
if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
10171017
return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
10181018
} else {
1019-
if ( ! current_user_can( $post_type->cap->edit_posts ) )
1019+
if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
10201020
return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
10211021
}
10221022

@@ -3928,7 +3928,7 @@ function blogger_newPost($args) {
39283928
do_action('xmlrpc_call', 'blogger.newPost');
39293929

39303930
$cap = ($publish) ? 'publish_posts' : 'edit_posts';
3931-
if ( !current_user_can($cap) )
3931+
if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
39323932
return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
39333933

39343934
$post_status = ($publish) ? 'publish' : 'draft';
@@ -4143,6 +4143,8 @@ function mw_newPost($args) {
41434143
$post_type = 'post';
41444144
}
41454145

4146+
if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
4147+
return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
41464148
if ( !current_user_can( $cap ) )
41474149
return new IXR_Error( 401, $error_message );
41484150

0 commit comments

Comments
 (0)