Changeset 16273

Timestamp:

11/10/2010 02:50:14 PM (16 years ago)

Author:

nacin

Message:

Cripple capability_type. Produced inconsistent, janky meta cap mapping; now only acts as a capability base. see #14122.

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (3 diffs)
• post.php (modified) (2 diffs)

trunk/wp-includes/capabilities.php

@@ -827 +827 @@
                 $post_type = get_post_type_object( $post->post_type );
 
-                if ( 'delete_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
-                        $args = array_merge( array( $post_type->cap->delete_post, $user_id ), $args );
-                        return call_user_func_array( 'map_meta_cap', $args );
+                if ( ! $post_type->map_meta_cap ) {
+                        $caps[] = $post_type->cap->$cap;
+                        break;
                 }
 
@@ -870 +870 @@
                 $post_type = get_post_type_object( $post->post_type );
 
-                if ( 'edit_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
-                        $args = array_merge( array( $post_type->cap->edit_post, $user_id ), $args );
-                        return call_user_func_array( 'map_meta_cap', $args );
+                if ( ! $post_type->map_meta_cap ) {
+                        $caps[] = $post_type->cap->$cap;
+                        break;
                 }
 
@@ -912 +912 @@
                 $post_type = get_post_type_object( $post->post_type );
 
-                if ( 'read_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
-                        $args = array_merge( array( $post_type->cap->read_post, $user_id ), $args );
-                        return call_user_func_array( 'map_meta_cap', $args );
+                if ( ! $post_type->map_meta_cap ) {
+                        $caps[] = $post_type->cap->$cap;
+                        break;
                 }
 

trunk/wp-includes/post.php

@@ -843 +843 @@
  * - menu_position - The position in the menu order the post type should appear. Defaults to the bottom.
  * - menu_icon - The url to the icon to be used for this menu. Defaults to use the posts icon.
- * - capability_type - The post type to use for checking read, edit, and delete capabilities. Defaults to 'post'.
+ * - capability_type - The string to use to build the read, edit, and delete capabilities. Defaults to 'post'.
  *   May be passed as an array to allow for alternative plurals when using this argument as a base to construct the
  *   capabilities, e.g. array('story', 'stories').
@@ -917 +917 @@
         if ( null === $args->exclude_from_search )
                 $args->exclude_from_search = !$args->public;
-
-        if ( empty($args->capability_type) )
-                $args->capability_type = 'post';
 
         $args->cap = get_post_type_capabilities( $args );