<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[16004] trunk/wp-admin/includes: Don't check the raw edit_others_posts cap.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16004">16004</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-27 08:48:55 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't check the raw edit_others_posts cap. see <a href="http://trac.wordpress.org/ticket/12702">#12702</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeslisttablemediaphp">trunk/wp-admin/includes/list-table-media.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeslisttablemediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-media.php (16003 => 16004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-media.php 2010-10-27 08:27:45 UTC (rev 16003)
+++ trunk/wp-admin/includes/list-table-media.php 2010-10-27 08:48:55 UTC (rev 16004)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> function extra_tablenav( $which ) {
</span><span class="cx"> global $post_type, $detached;
</span><ins>+ $post_type_obj = get_post_type_object( $post_type );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <?php
</span><span class="lines">@@ -104,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $detached ) { ?>
</span><span class="cx"> <input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e( 'Scan for lost attachments' ); ?>" class="button-secondary" />
</span><del>- <?php } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { ?>
</del><ins>+ <?php } elseif ( $this->is_trash && current_user_can( $post_type_obj->cap->edit_others_posts ) ) { ?>
</ins><span class="cx"> <input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (16003 => 16004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-10-27 08:27:45 UTC (rev 16003)
+++ trunk/wp-admin/includes/post.php 2010-10-27 08:48:55 UTC (rev 16004)
</span><span class="lines">@@ -205,11 +205,11 @@
</span><span class="cx">
</span><span class="cx"> wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
</span><span class="cx">
</span><del>- if ( current_user_can( 'edit_others_posts' ) ) {
- if ( !empty($post_data['sticky']) )
- stick_post($post_ID);
</del><ins>+ if ( current_user_can( $ptype->cap->edit_others_posts ) ) {
+ if ( ! empty( $post_data['sticky'] ) )
+ stick_post( $post_ID );
</ins><span class="cx"> else
</span><del>- unstick_post($post_ID);
</del><ins>+ unstick_post( $post_ID );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $post_ID;
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> $post_data['ID'] = $post_ID;
</span><span class="cx"> $updated[] = wp_update_post( $post_data );
</span><span class="cx">
</span><del>- if ( isset( $post_data['sticky'] ) && current_user_can( 'edit_others_posts' ) ) {
</del><ins>+ if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
</ins><span class="cx"> if ( 'sticky' == $post_data['sticky'] )
</span><span class="cx"> stick_post( $post_ID );
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>