<!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>[28074] branches/3.7: Ensure edit_post() promotes an auto-draft to draft.</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/28074">28074</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-11 04:37:21 +0000 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure edit_post() promotes an auto-draft to draft. Fixes Quick Draft.
Merges <a href="http://core.trac.wordpress.org/changeset/28073">[28073]</a> from the 3.8 branch to the 3.7 branch.
props dd32.
see <a href="http://core.trac.wordpress.org/ticket/27734">#27734</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpadminincludespostphp">branches/3.7/src/wp-admin/includes/post.php</a></li>
<li><a href="#branches37testsphpunittestsadminincludesPostphp">branches/3.7/tests/phpunit/tests/admin/includesPost.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.7
</span><span class="cx">===================================================================
</span><del>--- branches/3.7 2014-04-11 04:33:06 UTC (rev 28073)
</del><ins>+++ branches/3.7 2014-04-11 04:37:21 UTC (rev 28074)
</ins><a id="branches37"></a>
<div class="propset"><h4>Property changes: branches/3.7</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>-/branches/3.8:27917,27920,27976
</del><ins>+/branches/3.8:27917,27920,27976,28073
</ins><span class="cx"> /trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26148-26149,26186,26304-26305,26448-26449,26734,26782,26927,27872,27905-27906,27928,27964,27975,27990,28053
</span><span class="cx">\ No newline at end of property
</span><a id="branches37srcwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/post.php (28073 => 28074)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/post.php 2014-04-11 04:33:06 UTC (rev 28073)
+++ branches/3.7/src/wp-admin/includes/post.php 2014-04-11 04:37:21 UTC (rev 28074)
</span><span class="lines">@@ -203,10 +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>- if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {
- $post_data['post_status'] = 'draft';
- }
-
</del><span class="cx"> if ( isset($post_data['visibility']) ) {
</span><span class="cx"> switch ( $post_data['visibility'] ) {
</span><span class="cx"> case 'public' :
</span><span class="lines">@@ -227,6 +223,10 @@
</span><span class="cx"> if ( is_wp_error($post_data) )
</span><span class="cx"> wp_die( $post_data->get_error_message() );
</span><span class="cx">
</span><ins>+ if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {
+ $post_data['post_status'] = 'draft';
+ }
+
</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></pre></div>
<a id="branches37testsphpunittestsadminincludesPostphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/tests/phpunit/tests/admin/includesPost.php (28073 => 28074)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/tests/phpunit/tests/admin/includesPost.php 2014-04-11 04:33:06 UTC (rev 28073)
+++ branches/3.7/tests/phpunit/tests/admin/includesPost.php 2014-04-11 04:37:21 UTC (rev 28074)
</span><span class="lines">@@ -5,6 +5,11 @@
</span><span class="cx"> */
</span><span class="cx"> class Tests_Admin_includesPost extends WP_UnitTestCase {
</span><span class="cx">
</span><ins>+ function tearDown() {
+ wp_set_current_user( 0 );
+ parent::tearDown();
+ }
+
</ins><span class="cx"> function test__wp_translate_postdata_cap_checks_contributor() {
</span><span class="cx"> $contributor_id = $this->factory->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx"> $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="lines">@@ -56,8 +61,6 @@
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', $_results );
</span><span class="cx"> $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
</span><span class="cx"> $this->assertEquals( 'You are not allowed to edit posts as this user.', $_results->get_error_message() );
</span><del>-
- wp_set_current_user( 0 );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test__wp_translate_postdata_cap_checks_editor() {
</span><span class="lines">@@ -111,7 +114,24 @@
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $_results );
</span><span class="cx"> $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
</span><span class="cx"> $this->assertEquals( 'draft', $_results['post_status'] );
</span><ins>+ }
</ins><span class="cx">
</span><del>- wp_set_current_user( 0 );
</del><ins>+ /**
+ * @ticket 27734
+ */
+ function test_edit_post_promotes_auto_draft_to_draft() {
+ $admin = $this->factory->user->create( array( 'role' => 'administrator' ) );
+ wp_set_current_user( $admin );
+
+ $post = get_default_post_to_edit( 'post', true );
+ $post_data = array(
+ 'post_ID' => $post->ID,
+ 'post_type' => 'post',
+ 'post_content' => 'Some content',
+ );
+ $this->assertEquals( 'auto-draft', $post->post_status );
+ edit_post( $post_data );
+ $updated = get_post( $post->ID );
+ $this->assertEquals( 'draft', $updated->post_status );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>