Ticket #30991: 30991.5.diff

src/wp-includes/post.php

@@ -1485 +1485 @@
  * 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.
  *
- * 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
  *   generally mapped to corresponding primitive capabilities depending on the
@@ -1497 +1497 @@
  * - 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
  *   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.
  * - read_private_posts - Controls whether private objects can be read.
  *
  * These four 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
  * 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.
  *
  * - 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_published_posts - Controls whether published objects can be deleted.
  * - delete_others_posts - Controls whether objects owned by other users can be
@@ -1541 +1541 @@
                 'edit_post'          => 'edit_' . $singular_base,
                 'read_post'          => 'read_' . $singular_base,
                 'delete_post'        => 'delete_' . $singular_base,
+                'delete_posts'       => 'delete_' . $plural_base,
                 // Primitive capabilities used outside of map_meta_cap():
                 'edit_posts'         => 'edit_' . $plural_base,
                 'edit_others_posts'  => 'edit_others_' . $plural_base,
@@ -1552 +1553 @@
         if ( $args->map_meta_cap ) {
                 $default_capabilities_for_mapping = array(
                         'read'                   => 'read',
-                        'delete_posts'           => 'delete_' . $plural_base,
                         'delete_private_posts'   => 'delete_private_' . $plural_base,
                         'delete_published_posts' => 'delete_published_' . $plural_base,
                         'delete_others_posts'    => 'delete_others_' . $plural_base,

tests/phpunit/tests/user/mapMetaCap.php

@@ -82 +82 @@
                         array( 'delete_others_posts', 'delete_private_posts' ),
                         map_meta_cap( 'delete_post', self::$user_id, self::$post_id )
                 );
+                $this->assertEquals(
+                        array( 'delete_posts' ),
+                        map_meta_cap( $post_type_object->cap->delete_posts, self::$user_id, self::$post_id )
+                );
                 $this->assertEquals(
                         array( 'delete_others_posts', 'delete_private_posts' ),
                         map_meta_cap( $post_type_object->cap->delete_post, self::$user_id, self::$post_id )