Changeset 28073

Timestamp:

04/11/2014 04:33:06 AM (9 years ago)

Author:

nacin

Message:

Ensure edit_post() promotes an auto-draft to draft. Fixes Quick Draft.

For the 3.8 branch. Regression from [27976] that does not affect trunk.

props dd32.
see #27734.

Location:

branches/3.8

Files:

• src/wp-admin/includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/admin/includesPost.php (modified) (3 diffs)

branches/3.8/src/wp-admin/includes/post.php

@@ -204 +204 @@
     }
 
-    if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {
-        $post_data['post_status'] = 'draft';
-    }
-
     if ( isset($post_data['visibility']) ) {
         switch ( $post_data['visibility'] ) {
@@ -227 +223 @@
     if ( is_wp_error($post_data) )
         wp_die( $post_data->get_error_message() );
+
+    if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {
+        $post_data['post_status'] = 'draft';
+    }
 
     // Post Formats

branches/3.8/tests/phpunit/tests/admin/includesPost.php

@@ -5 +5 @@
  */
 class Tests_Admin_includesPost extends WP_UnitTestCase {
+
+    function tearDown() {
+        wp_set_current_user( 0 );
+        parent::tearDown();
+    }
 
     function test__wp_translate_postdata_cap_checks_contributor() {
@@ -57 +62 @@
         $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
         $this->assertEquals( 'You are not allowed to edit posts as this user.', $_results->get_error_message() );
-
-        wp_set_current_user( 0 );
     }
 
@@ -112 +115 @@
         $this->assertEquals( $_post_data['post_author'], $_results['post_author'] );
         $this->assertEquals( 'draft', $_results['post_status'] );
+    }
 
-        wp_set_current_user( 0 );
+    /**
+     * @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 );
     }
 }