Changeset 15935

Timestamp:

10/23/2010 06:16:41 PM (16 years ago)

Author:

nacin

Message:

Remove some capability_type code in WP_Query. Only build faux caps if we're querying for multiple post types or if the post type object can't be found. see #14122.

File:

• trunk/wp-includes/query.php (modified) (2 diffs)

trunk/wp-includes/query.php

@@ -2034 +2034 @@
                 }
 
-                if ( is_array($post_type) ) {
+                if ( is_array( $post_type ) ) {
                         $post_type_cap = 'multiple_post_type';
                 } else {
-                        $post_type_object = get_post_type_object ( $post_type );
-                        if ( !empty($post_type_object) )
-                                $post_type_cap = $post_type_object->capability_type;
-                        else
+                        $post_type_object = get_post_type_object( $post_type );
+                        if ( empty( $post_type_object ) )
                                 $post_type_cap = $post_type;
                 }
@@ -2067 +2065 @@
                 }
 
-                if ( !empty($post_type_object) ) {
-                        $post_type_cap = $post_type_object->capability_type;
+                if ( ! empty( $post_type_object ) ) {
                         $edit_cap = $post_type_object->cap->edit_post;
                         $read_cap = $post_type_object->cap->read_post;