<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[11960] trunk/wp-includes/query.php:
Set the cap appropriate to the post type.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11960">11960</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-22 22:57:01 +0000 (Tue, 22 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set the cap appropriate to the post type. fixes <a href="http://trac.wordpress.org/ticket/10807">#10807</a> see <a href="http://trac.wordpress.org/ticket/10605">#10605</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (11959 => 11960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-09-22 07:16:19 UTC (rev 11959)
+++ trunk/wp-includes/query.php 2009-09-22 22:57:01 UTC (rev 11960)
</span><span class="lines">@@ -2070,17 +2070,21 @@
</span><span class="cx"> $q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $post_type_cap = $post_type;
+
</ins><span class="cx"> if ( 'any' == $post_type ) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type != 'revision'";
</span><span class="cx"> } elseif ( ! empty( $post_type ) ) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type = '$post_type'";
</span><span class="cx"> } elseif ( $this->is_attachment ) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type = 'attachment'";
</span><ins>+ $post_type_cap = 'post';
</ins><span class="cx"> } elseif ($this->is_page) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type = 'page'";
</span><ins>+ $post_type_cap = 'page';
</ins><span class="cx"> } else {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type = 'post'";
</span><del>- $post_type = 'post';
</del><ins>+ $post_type_cap = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($q['post_status']) && '' != $q['post_status'] ) {
</span><span class="lines">@@ -2109,13 +2113,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($r_status) ) {
</span><del>- if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type}s") )
</del><ins>+ if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type_cap}s") )
</ins><span class="cx"> $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
</span><span class="cx"> else
</span><span class="cx"> $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($p_status) ) {
</span><del>- if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can("read_private_{$post_type}s") )
</del><ins>+ if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can("read_private_{$post_type_cap}s") )
</ins><span class="cx"> $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
</span><span class="cx"> else
</span><span class="cx"> $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
</span><span class="lines">@@ -2134,7 +2138,7 @@
</span><span class="cx"> $where .= " OR $wpdb->posts.post_status = 'future' OR $wpdb->posts.post_status = 'draft' OR $wpdb->posts.post_status = 'pending'";
</span><span class="cx">
</span><span class="cx"> if ( is_user_logged_in() ) {
</span><del>- $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'";
</del><ins>+ $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'";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $where .= ')';
</span><span class="lines">@@ -2292,7 +2296,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (in_array($status, array('draft', 'pending')) ) {
</span><span class="cx"> // User must have edit permissions on the draft to preview.
</span><del>- if (! current_user_can('edit_post', $this->posts[0]->ID)) {
</del><ins>+ if (! current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
</ins><span class="cx"> $this->posts = array();
</span><span class="cx"> } else {
</span><span class="cx"> $this->is_preview = true;
</span><span class="lines">@@ -2300,17 +2304,17 @@
</span><span class="cx"> }
</span><span class="cx"> } else if ('future' == $status) {
</span><span class="cx"> $this->is_preview = true;
</span><del>- if (!current_user_can('edit_post', $this->posts[0]->ID)) {
</del><ins>+ if (!current_user_can("edit_$post_type_cap", $this->posts[0]->ID)) {
</ins><span class="cx"> $this->posts = array ( );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if (! current_user_can('read_post', $this->posts[0]->ID))
</del><ins>+ if (! current_user_can("read_$post_type_cap", $this->posts[0]->ID))
</ins><span class="cx"> $this->posts = array();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->is_preview && current_user_can( "edit_{$post_type}", $this->posts[0]->ID ) )
</del><ins>+ if ( $this->is_preview && current_user_can( "edit_{$post_type_cap}", $this->posts[0]->ID ) )
</ins><span class="cx"> $this->posts[0] = apply_filters('the_preview', $this->posts[0]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>