<!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>[27976] branches/3.8: Better checks for contributors when saving posts.</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/27976">27976</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-06 22:15:05 +0000 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better checks for contributors when saving posts.
Merges <a href="http://core.trac.wordpress.org/changeset/27964">[27964]</a> and <a href="http://core.trac.wordpress.org/changeset/27975">[27975]</a> to the 3.8 branch.
props dd32, kovshenin, plocha.
see <a href="http://core.trac.wordpress.org/ticket/27452">#27452</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches38srcwpadminincludesclasswppostslisttablephp">branches/3.8/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#branches38srcwpadminincludespostphp">branches/3.8/src/wp-admin/includes/post.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches38">branches/3.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.8
</span><span class="cx">===================================================================
</span><del>--- branches/3.8 2014-04-06 22:07:02 UTC (rev 27975)
</del><ins>+++ branches/3.8 2014-04-06 22:15:05 UTC (rev 27976)
</ins><a id="branches38"></a>
<div class="propset"><h4>Property changes: branches/3.8</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,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007,27012,27021,27119,27134,27511,27760,27822,27872,27905-27906,27928
</del><ins>+/trunk:18512,26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007,27012,27021,27119,27134,27511,27760,27822,27872,27905-27906,27928,27964,27975
</ins><span class="cx">\ No newline at end of property
</span><a id="branches38srcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/includes/class-wp-posts-list-table.php (27975 => 27976)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/includes/class-wp-posts-list-table.php 2014-04-06 22:07:02 UTC (rev 27975)
+++ branches/3.8/src/wp-admin/includes/class-wp-posts-list-table.php 2014-04-06 22:15:05 UTC (rev 27976)
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx"> <?php if ( !$bulk ) echo $authors_dropdown;
</span><span class="cx"> endif; // post_type_supports author
</span><span class="cx">
</span><del>- if ( !$bulk ) :
</del><ins>+ if ( !$bulk && $can_publish ) :
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="inline-edit-group">
</span></span></pre></div>
<a id="branches38srcwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-admin/includes/post.php (27975 => 27976)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-admin/includes/post.php 2014-04-06 22:07:02 UTC (rev 27975)
+++ branches/3.8/src/wp-admin/includes/post.php 2014-04-06 22:15:05 UTC (rev 27976)
</span><span class="lines">@@ -100,6 +100,10 @@
</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>+ if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
+ $post_data['post_status'] = $previous_status ? $previous_status : 'pending';
+ }
+
</ins><span class="cx"> $published_statuses = array( 'publish', 'future' );
</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="lines">@@ -111,6 +115,10 @@
</span><span class="cx"> if ( ! isset($post_data['post_status']) )
</span><span class="cx"> $post_data['post_status'] = $previous_status;
</span><span class="cx">
</span><ins>+ if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
+ unset( $post_data['post_password'] );
+ }
+
</ins><span class="cx"> if (!isset( $post_data['comment_status'] ))
</span><span class="cx"> $post_data['comment_status'] = 'closed';
</span><span class="cx">
</span><span class="lines">@@ -170,6 +178,14 @@
</span><span class="cx"> $post_data['post_type'] = $post->post_type;
</span><span class="cx"> $post_data['post_mime_type'] = $post->post_mime_type;
</span><span class="cx">
</span><ins>+ if ( ! empty( $post_data['post_status'] ) ) {
+ $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+
+ if ( 'inherit' == $post_data['post_status'] ) {
+ unset( $post_data['post_status'] );
+ }
+ }
+
</ins><span class="cx"> $ptype = get_post_type_object($post_data['post_type']);
</span><span class="cx"> if ( !current_user_can( 'edit_post', $post_ID ) ) {
</span><span class="cx"> if ( 'page' == $post_data['post_type'] )
</span><span class="lines">@@ -187,9 +203,6 @@
</span><span class="cx"> _wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_data = _wp_translate_postdata( true, $post_data );
- if ( is_wp_error($post_data) )
- wp_die( $post_data->get_error_message() );
</del><span class="cx"> if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {
</span><span class="cx"> $post_data['post_status'] = 'draft';
</span><span class="cx"> }
</span><span class="lines">@@ -210,6 +223,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $post_data = _wp_translate_postdata( true, $post_data );
+ if ( is_wp_error($post_data) )
+ wp_die( $post_data->get_error_message() );
+
</ins><span class="cx"> // Post Formats
</span><span class="cx"> if ( isset( $post_data['post_format'] ) )
</span><span class="cx"> set_post_format( $post_ID, $post_data['post_format'] );
</span><span class="lines">@@ -332,6 +349,14 @@
</span><span class="cx"> }
</span><span class="cx"> unset($post_data['_status']);
</span><span class="cx">
</span><ins>+ if ( ! empty( $post_data['post_status'] ) ) {
+ $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+
+ if ( 'inherit' == $post_data['post_status'] ) {
+ unset( $post_data['post_status'] );
+ }
+ }
+
</ins><span class="cx"> $post_IDs = array_map( 'intval', (array) $post_data['post'] );
</span><span class="cx">
</span><span class="cx"> $reset = array(
</span><span class="lines">@@ -422,10 +447,25 @@
</span><span class="cx"> unset( $post_data['tax_input']['category'] );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $post_data['post_type'] = $post->post_type;
</ins><span class="cx"> $post_data['post_mime_type'] = $post->post_mime_type;
</span><span class="cx"> $post_data['guid'] = $post->guid;
</span><span class="cx">
</span><ins>+ foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
+ if ( ! isset( $post_data[ $field ] ) ) {
+ $post_data[ $field ] = $post->$field;
+ }
+ }
+
</ins><span class="cx"> $post_data['ID'] = $post_ID;
</span><ins>+ $post_data['post_ID'] = $post_ID;
+
+ $post_data = _wp_translate_postdata( true, $post_data );
+ if ( is_wp_error( $post_data ) ) {
+ $skipped[] = $post_ID;
+ continue;
+ }
+
</ins><span class="cx"> $updated[] = wp_update_post( $post_data );
</span><span class="cx">
</span><span class="cx"> if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
</span><span class="lines">@@ -569,10 +609,6 @@
</span><span class="cx"> if ( isset( $_POST['post_ID'] ) )
</span><span class="cx"> return edit_post();
</span><span class="cx">
</span><del>- $translated = _wp_translate_postdata( false );
- if ( is_wp_error($translated) )
- return $translated;
-
</del><span class="cx"> if ( isset($_POST['visibility']) ) {
</span><span class="cx"> switch ( $_POST['visibility'] ) {
</span><span class="cx"> case 'public' :
</span><span class="lines">@@ -589,6 +625,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $translated = _wp_translate_postdata( false );
+ if ( is_wp_error($translated) )
+ return $translated;
+
</ins><span class="cx"> // Create the post.
</span><span class="cx"> $post_ID = wp_insert_post( $_POST );
</span><span class="cx"> if ( is_wp_error( $post_ID ) )
</span></span></pre>
</div>
</div>
</body>
</html>