<!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>[14130] trunk/wp-admin/includes/post.php: Update _wp_translate_postdata()
capability checks to use Post Type API capability fields.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14130">14130</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-18 04:26:39 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update _wp_translate_postdata() capability checks to use Post Type API capability fields. Props duck_. Fixes <a href="http://trac.wordpress.org/ticket/12987">#12987</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-18 04:01:19 UTC (rev 14129)
+++ trunk/wp-admin/includes/post.php 2010-04-18 04:26:39 UTC (rev 14130)
</span><span class="lines">@@ -44,16 +44,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $ptype = get_post_type_object( $post_data['post_type'] );
</ins><span class="cx"> if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) {
</span><del>- if ( 'page' == $post_data['post_type'] ) {
- if ( !current_user_can( 'edit_others_pages' ) ) {
</del><ins>+ if ( !current_user_can( $ptype->edit_others_cap ) ) {
+ if ( 'page' == $post_data['post_type'] ) {
</ins><span class="cx"> return new WP_Error( 'edit_others_pages', $update ?
</span><span class="cx"> __( 'You are not allowed to edit pages as this user.' ) :
</span><span class="cx"> __( 'You are not allowed to create pages as this user.' )
</span><span class="cx"> );
</span><del>- }
- } else {
- if ( !current_user_can( 'edit_others_posts' ) ) {
</del><ins>+ } else {
</ins><span class="cx"> return new WP_Error( 'edit_others_posts', $update ?
</span><span class="cx"> __( 'You are not allowed to edit posts as this user.' ) :
</span><span class="cx"> __( 'You are not allowed to post as this user.' )
</span><span class="lines">@@ -82,15 +81,8 @@
</span><span class="cx">
</span><span class="cx"> // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
</span><span class="cx"> // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
</span><del>- if ( isset( $post_data['post_type'] ) && 'page' == $post_data['post_type'] ) {
- $publish_cap = 'publish_pages';
- $edit_cap = 'edit_published_pages';
- } else {
- $publish_cap = 'publish_posts';
- $edit_cap = 'edit_published_posts';
- }
- if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $publish_cap )) )
- if ( $previous_status != 'publish' || !current_user_can( $edit_cap ) )
</del><ins>+ if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->publish_cap )) )
+ if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) )
</ins><span class="cx"> $post_data['post_status'] = 'pending';
</span><span class="cx">
</span><span class="cx"> if ( ! isset($post_data['post_status']) )
</span></span></pre>
</div>
</div>
</body>
</html>