Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-10 13:49:12 +01:00
Code Issues Projects Releases Wiki Activity

Posts, Post Types: Ensure delete_posts is included in default post type capabilities regardless of map_meta_cap value.

Browse Source 
This resolves PHP notices in a few places in core where this capability is checked.

Props Mte90, johnbillion, dipesh.kakadiya, jipmoors, bamadesigner, dd32, johnjamesjacoby, xedin.unknown, flixos90, SergeyBiryukov.
Fixes #30991.
Built from https://develop.svn.wordpress.org/trunk@47357


git-svn-id: http://core.svn.wordpress.org/trunk@47144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-02-25 12:50:06 +00:00
parent 1a090b3385
commit aaccfc063f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/post.php
View File

@ -1509,7 +1509,7 @@ function unregister_post_type( $post_type ) {
* Otherwise, an 's' will be added to the value for the plural form. After * Otherwise, an 's' will be added to the value for the plural form. After
* registration, capability_type will always be a string of the singular value. * registration, capability_type will always be a string of the singular value.
* *
* By default, seven keys are accepted as part of the capabilities array: * By default, eight keys are accepted as part of the capabilities array:
* *
* - edit_post, read_post, and delete_post are meta capabilities, which are then * - edit_post, read_post, and delete_post are meta capabilities, which are then
* generally mapped to corresponding primitive capabilities depending on the * generally mapped to corresponding primitive capabilities depending on the
@ -1521,17 +1521,17 @@ function unregister_post_type( $post_type ) {
* - edit_others_posts - Controls whether objects of this type owned by other users * - edit_others_posts - Controls whether objects of this type owned by other users
* can be edited. If the post type does not support an author, then this will * can be edited. If the post type does not support an author, then this will
* behave like edit_posts. * behave like edit_posts.
* - delete_posts - Controls whether objects of this post type can be deleted.
* - publish_posts - Controls publishing objects of this post type. * - publish_posts - Controls publishing objects of this post type.
* - read_private_posts - Controls whether private objects can be read. * - read_private_posts - Controls whether private objects can be read.
* *
* These four primitive capabilities are checked in core in various locations. * These five primitive capabilities are checked in core in various locations.
* There are also seven other primitive capabilities which are not referenced * There are also six other primitive capabilities which are not referenced
* directly in core, except in map_meta_cap(), which takes the three aforementioned * directly in core, except in map_meta_cap(), which takes the three aforementioned
* meta capabilities and translates them into one or more primitive capabilities * meta capabilities and translates them into one or more primitive capabilities
* that must then be checked against the user or role, depending on the context. * that must then be checked against the user or role, depending on the context.
* *
* - read - Controls whether objects of this post type can be read. * - read - Controls whether objects of this post type can be read.
* - delete_posts - Controls whether objects of this post type can be deleted.
* - delete_private_posts - Controls whether private objects can be deleted. * - delete_private_posts - Controls whether private objects can be deleted.
* - delete_published_posts - Controls whether published objects can be deleted. * - delete_published_posts - Controls whether published objects can be deleted.
* - delete_others_posts - Controls whether objects owned by other users can be * - delete_others_posts - Controls whether objects owned by other users can be
@ -1568,6 +1568,7 @@ function get_post_type_capabilities( $args ) {
// Primitive capabilities used outside of map_meta_cap(): // Primitive capabilities used outside of map_meta_cap():
'edit_posts' => 'edit_' . $plural_base, 'edit_posts' => 'edit_' . $plural_base,
'edit_others_posts' => 'edit_others_' . $plural_base, 'edit_others_posts' => 'edit_others_' . $plural_base,
'delete_posts' => 'delete_' . $plural_base,
'publish_posts' => 'publish_' . $plural_base, 'publish_posts' => 'publish_' . $plural_base,
'read_private_posts' => 'read_private_' . $plural_base, 'read_private_posts' => 'read_private_' . $plural_base,
); );
@ -1576,7 +1577,6 @@ function get_post_type_capabilities( $args ) {
if ( $args->map_meta_cap ) { if ( $args->map_meta_cap ) {
$default_capabilities_for_mapping = array( $default_capabilities_for_mapping = array(
'read' => 'read', 'read' => 'read',
'delete_posts' => 'delete_' . $plural_base,
'delete_private_posts' => 'delete_private_' . $plural_base, 'delete_private_posts' => 'delete_private_' . $plural_base,
'delete_published_posts' => 'delete_published_' . $plural_base, 'delete_published_posts' => 'delete_published_' . $plural_base,
'delete_others_posts' => 'delete_others_' . $plural_base, 'delete_others_posts' => 'delete_others_' . $plural_base,

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-beta2-47356'; $wp_version = '5.4-beta2-47357';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.