Ticket #35874: fix-and-test-update-post.patch

src/wp-includes/post.php

@@ -3538 +3538 @@
                 $post_cats = $post['post_category'];
 
         // Drafts shouldn't be assigned a date unless explicitly done so by the user.
-        if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-                         ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
-                $clear_date = true;
-        else
-                $clear_date = false;
+        $clear_date = false;
+        if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) ) {
+                // edit_date will only be set for date edits made throug wp-admin, not through XMRLPC API
+                $missing_admin_edit_flag = empty( $postarr['edit_date'] );
+                $missing_post_date = ( '0000-00-00 00:00:00' == $post['post_date_gmt'] );
+                $missing_post_date_gmt = ( '0000-00-00 00:00:00' == $post['post_date'] );
+                if ( $missing_admin_edit_flag && $missing_post_date && $missing_post_date_gmt ) {
+                        $clear_date = true;
+                }
+        }
 
         // Merge old and new fields with new fields overwriting old ones.
         $postarr = array_merge($post, $postarr);

tests/phpunit/tests/post.php

@@ -1258 +1258 @@
                 $this->assertEquals( 0, get_post( $page_id )->post_parent );
         }
 
+        /**
+         * @ticket 35874
+         */
+        function test_wp_update_post_should_respect_post_date() {
+                $post = array(
+                        'post_author' => self::$editor_id,
+                        'post_status' => 'draft',
+                        'post_content' => rand_str(),
+                        'post_title' => rand_str(),
+                );
+
+                $id = wp_insert_post($post);
+
+                $out = get_post($id);
+
+                // Change the post status to publish while also supplying a date
+                $specific_date = strftime("%Y-%m-%d %H:%M:%S", strtotime('+1 day'));
+
+                $post['ID'] = $id;
+                $post['post_date'] = $specific_date;
+                $post['post_status'] = 'publish';
+                wp_update_post( $post );
+
+                // Updated post should still possess the specified date
+                $out = get_post($id);
+                $this->assertEquals($specific_date, $out->post_date);
+        }
+
 }