Changeset 11960 for trunk/wp-includes/query.php

Timestamp:

09/22/2009 10:57:01 PM (15 years ago)

Author:

ryan

Message:

Set the cap appropriate to the post type. fixes #10807 see #10605

File:

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

trunk/wp-includes/query.php

@@ -2071 +2071 @@
         }
 
+        $post_type_cap = $post_type;
+
         if ( 'any' == $post_type ) {
             $where .= " AND $wpdb->posts.post_type != 'revision'";
@@ -2077 +2079 @@
         } elseif ( $this->is_attachment ) {
             $where .= " AND $wpdb->posts.post_type = 'attachment'";
+            $post_type_cap = 'post';
         } elseif ($this->is_page) {
             $where .= " AND $wpdb->posts.post_type = 'page'";
+            $post_type_cap = 'page';
         } else {
             $where .= " AND $wpdb->posts.post_type = 'post'";
-            $post_type = 'post';
+            $post_type_cap = 'post';
         }
 
@@ -2110 +2114 @@
 
             if ( !empty($r_status) ) {
-                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type}s") )
+                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type_cap}s") )
                     $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $r_status ) . "))";
                 else
@@ -2116 +2120 @@
             }
             if ( !empty($p_status) ) {
-                if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can("read_private_{$post_type}s") )
+                if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can("read_private_{$post_type_cap}s") )
                     $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $p_status ) . "))";
                 else
@@ -2135 +2139 @@
 
             if ( is_user_logged_in() ) {
-                $where .= current_user_can( "read_private_{$post_type}s" ) ? " OR $wpdb->posts.post_status = 'private'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.post_status = 'private'";
+                $where .= current_user_can( "read_private_{$post_type_cap}s" ) ? " OR $wpdb->posts.post_status = 'private'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.post_status = 'private'";
             }
 
@@ -2293 +2297 @@
                     if  (in_array($status, array('draft', 'pending')) ) {
                         // User must have edit permissions on the draft to preview.
-                        if (! current_user_can('edit_post', $this->posts[0]->ID)) {
+                        if (! current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
                             $this->posts = array();
                         } else {
@@ -2301 +2305 @@
                     }  else if ('future' == $status) {
                         $this->is_preview = true;
-                        if (!current_user_can('edit_post', $this->posts[0]->ID)) {
+                        if (!current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
                             $this->posts = array ( );
                         }
                     } else {
-                        if (! current_user_can('read_post', $this->posts[0]->ID))
+                        if (! current_user_can("read_$post_type_cap", $this->posts[0]->ID))
                             $this->posts = array();
                     }
@@ -2311 +2315 @@
             }
 
-            if ( $this->is_preview && current_user_can( "edit_{$post_type}", $this->posts[0]->ID ) )
+            if ( $this->is_preview && current_user_can( "edit_{$post_type_cap}", $this->posts[0]->ID ) )
                 $this->posts[0] = apply_filters('the_preview', $this->posts[0]);
         }