Changeset 15892

Timestamp:

10/21/2010 03:05:10 PM (16 years ago)

Author:

nacin

Message:

Clean up get_post_type_capabilities. Don't bother with new capabilities for edit_others_posts and delete_others_posts if the post type does not support authors.

File:

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

trunk/wp-includes/post.php

@@ -990 +990 @@
  */
 function get_post_type_capabilities( $args ) {
-        global $_post_type_meta_capabilities;
-
         $default_capabilities = array(
                 // Meta capabilities are generally mapped to primitive capabilities depending on the context
@@ -1004 +1002 @@
                 'read_private_posts' => 'read_private_' . $args->capability_type . 's',
         );
+
         // Primitive capabilities that are used within map_meta_cap():
         if ( $args->map_meta_cap ) {
@@ -1010 +1009 @@
                         'delete_posts'           => 'delete_'           . $args->capability_type . 's',
                         'delete_private_posts'   => 'delete_private_'   . $args->capability_type . 's',
-                        'delete_published_posts' => 'delete_published_' . $args->capability_type . 's', 
+                        'delete_published_posts' => 'delete_published_' . $args->capability_type . 's',
                         'delete_others_posts'    => 'delete_others_'    . $args->capability_type . 's',
                         'edit_private_posts'     => 'edit_private_'     . $args->capability_type . 's',
@@ -1017 +1016 @@
                 $default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
         }
+
+        if ( ! post_type_supports( $args->name, 'author' ) ) {
+                // While these may be checked in core, users/roles shouldn't need to be granted these.
+                $default_capabilities['edit_others_posts']   = $default_capabilities['edit_posts'];
+                $default_capabilities['delete_others_posts'] = $default_capabilities['delete_posts'];
+        }
+
         $capabilities = array_merge( $default_capabilities, $args->capabilities );
+
+        // Remember meta capabilities for future reference.
         if ( $args->map_meta_cap )
                 _post_type_meta_capabilities( $capabilities );
+
         return (object) $capabilities;
 }