Changeset 16273 for trunk/wp-includes/capabilities.php

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.

File:

• trunk/wp-includes/capabilities.php (modified) (3 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;
                 }