Changeset 27405

Timestamp:

03/05/2014 06:25:31 AM (13 years ago)

Author:

nacin

Message:

Always convert auto-drafts to drafts in edit_draft() and _wp_translate_postdata().

This regressed due to refactoring in [26995]. This commit fixes Quick Draft.

see #25272.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/post.php

@@ -84 +84 @@
 
                 // No longer an auto-draft
-                if ( 'auto-draft' == $post_data['post_status'] )
+                if ( 'auto-draft' === $post_data['post_status'] ) {
                         $post_data['post_status'] = 'draft';
+                }
         }
 
@@ -114 +115 @@
                         $post_data['post_status'] = 'pending';
 
-        if ( ! isset($post_data['post_status']) )
-                $post_data['post_status'] = $previous_status;
+        if ( ! isset( $post_data['post_status'] ) ) {
+                $post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
+        }
 
         if (!isset( $post_data['comment_status'] ))

trunk/tests/phpunit/tests/admin/includesPost.php

@@ -115 +115 @@
                 wp_set_current_user( 0 );
         }
+
+        /**
+         * edit_post() should convert an existing auto-draft to a draft.
+         *
+         * @ticket 25272
+         */
+        function test_edit_post_auto_draft() {
+                $user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
+                wp_set_current_user( $user_id );
+                $post = $this->factory->post->create_and_get( array( 'post_status' => 'auto-draft' ) );
+                $this->assertEquals( 'auto-draft', $post->post_status );
+                $post_data = array(
+                        'post_title' => 'Post title',
+                        'content' => 'Post content',
+                        'post_type' => 'post',
+                        'post_ID' => $post->ID,
+                );
+                edit_post( $post_data );
+                $this->assertEquals( 'draft', get_post( $post->ID )->post_status );
+                wp_set_current_user( 0 );
+        }
+
 }