Ticket #35874: xmlrpc-based-fix-and-test-2.patch

src/wp-includes/class-wp-xmlrpc-server.php

@@ -1351 +1351 @@
                         $dateCreated = $post_data['post_date']->getIso();
                 }
 
+                // We need to pass along a value to wp_update_post for "edit_date", indicating whether
+                // an intentional edit is being made to the date. This drives logic that determines
+                // whether the value of post_date or post_date_gmt will be disregarded or not for
+                // draft posts.
+                $post_data['edit_date'] = false;
                 if ( ! empty( $dateCreated ) ) {
                         $post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
                         $post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+
+                        // If $dateCreated is not empty, it means that a specific date was supplied.
+                        $post_data['edit_date'] = true;
                 }
 
                 if ( ! isset( $post_data['ID'] ) )
@@ -5362 +5370 @@
                 elseif ( !empty( $content_struct['dateCreated']) )
                         $dateCreated = $content_struct['dateCreated']->getIso();
 
+                // We need to pass along a value to wp_update_post for "edit_date", indicating whether
+                // an intentional edit is being made to the date. This drives logic that determines
+                // whether the value of post_date or post_date_gmt will be disregarded or not for
+                // draft posts.
+                $edit_date = false;
                 if ( !empty( $dateCreated ) ) {
                         $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
                         $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+
+                        // If $dateCreated is not empty, it means that a specific date was supplied.
+                        $edit_date = true;
                 } else {
                         $post_date     = $postdata['post_date'];
                         $post_date_gmt = $postdata['post_date_gmt'];
                 }
 
                 // We've got all the data -- post it.
-                $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
+                $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
 
                 $result = wp_update_post($newpost, true);
                 if ( is_wp_error( $result ) )

tests/phpunit/tests/xmlrpc/mw/editPost.php

@@ -241 +241 @@
                 $tags2 = get_the_tags( $post_id );
                 $this->assertEmpty( $tags2 );
         }
+
+        /**
+         * @ticket 35874
+         */
+        function test_draft_not_prematurely_published() {
+                $editor_id = $this->make_user_by_role( 'editor' );
+
+                $post = array (
+                        'title' => 'Title'
+                );
+
+                // We have to use mw_newPost method, rather than the factory
+                // post->create method to create the database conditions that exhibit the bug.
+                $post_id = $this->myxmlrpcserver->mw_newPost( array( 1, 'editor', 'editor', $post ) );
+
+                // Change the post's status to publish and date to future
+                $future_time = strtotime( '+1 day' );
+                $future_date = new IXR_Date( $future_time );
+                $this->myxmlrpcserver->mw_editPost( array( $post_id, 'editor', 'editor', array(
+                        'dateCreated' => $future_date,
+                        'post_status' => 'publish'
+                ) ) );
+
+                $after = get_post( $post_id );
+                $this->assertEquals( 'future', $after->post_status );
+
+                $future_date_string = strftime( "%Y-%m-%d %H:%M:%S", $future_time );
+                $this->assertEquals( $future_date_string, $after->post_date );
+        }
 }

tests/phpunit/tests/xmlrpc/wp/editPost.php

@@ -401 +401 @@
                 // Check that the old enclosure is in the enclosure meta
                 $this->assertTrue( in_array( $enclosure_string, get_post_meta( $post_id, 'enclosure' ) ) );
         }
+
+        /**
+         * @ticket 35874
+         */
+        function test_draft_not_prematurely_published() {
+                $editor_id = $this->make_user_by_role( 'editor' );
+
+                $post = array (
+                        'title' => 'Title'
+                );
+
+                // We have to use wp_newPost method, rather than the factory
+                // post->create method to create the database conditions that exhibit the bug.
+                $post = array(
+                        'post_title' => 'Test',
+                        'post_status' => 'draft'
+                );
+                $post_id = $this->myxmlrpcserver->wp_newPost( array( 1, 'editor', 'editor', $post ) );
+
+                // Change the post's status to publish and date to future
+                $future_time = strtotime( '+1 day' );
+                $future_date = new IXR_Date( $future_time );
+                $new_post_content = array(
+                        'ID' => $post_id,
+                        'post_title' => "Updated",
+                        'post_status' => "publish",
+                        'post_date' => $future_date,
+                );
+
+                $this->myxmlrpcserver->wp_editPost( array( 1, 'editor', 'editor', $post_id, $new_post_content ) );
+
+                $after = get_post( $post_id );
+                $this->assertEquals( 'future', $after->post_status );
+
+                $future_date_string = strftime( "%Y-%m-%d %H:%M:%S", $future_time );
+                $this->assertEquals( $future_date_string, $after->post_date );
+        }
 }