<!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" />
<title>[24479] branches/3.5: Better cap checks in _wp_translate_post_data().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24479">24479</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-06-21 06:02:58 +0000 (Fri, 21 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better cap checks in _wp_translate_post_data().
Merges <a href="http://core.trac.wordpress.org/changeset/24478">[24478]</a> to the 3.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches35wpadminincludespostphp">branches/3.5/wp-admin/includes/post.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches35">branches/3.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.5
</span><span class="cx">===================================================================
</span><del>--- branches/3.5 2013-06-21 06:00:59 UTC (rev 24478)
</del><ins>+++ branches/3.5 2013-06-21 06:02:58 UTC (rev 24479)
</ins><a id="branches35"></a>
<div class="propset"><h4>Property changes: branches/3.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463,24466,24468,24470,24472,24474,24476
</del><ins>+/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463,24466,24468,24470,24472,24474,24476,24478
</ins><span class="cx">\ No newline at end of property
</span><a id="branches35wpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-admin/includes/post.php (24478 => 24479)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-admin/includes/post.php 2013-06-21 06:00:59 UTC (rev 24478)
+++ branches/3.5/wp-admin/includes/post.php 2013-06-21 06:02:58 UTC (rev 24479)
</span><span class="lines">@@ -65,15 +65,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $update && isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
</del><ins>+ if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
</ins><span class="cx"> && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
</span><del>-
- if ( 'page' == $post_data['post_type'] )
- return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
- else
- return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
</del><ins>+ if ( $update ) {
+ if ( 'page' == $post_data['post_type'] )
+ return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+ else
+ return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+ } else {
+ if ( 'page' == $post_data['post_type'] )
+ return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+ else
+ return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! empty( $post_data['post_status'] ) )
+ $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+
</ins><span class="cx"> // What to do based on which button they pressed
</span><span class="cx"> if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
</span><span class="cx"> $post_data['post_status'] = 'draft';
</span><span class="lines">@@ -92,10 +101,12 @@
</span><span class="cx"> $post_id = false;
</span><span class="cx"> $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
</span><span class="cx">
</span><ins>+ $published_statuses = array( 'publish', 'future' );
+
</ins><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_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->cap->publish_posts )) )
- if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) )
</del><ins>+ if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
+ if ( ! in_array( $previous_status, $published_statuses ) || !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>