Ticket #15946: 15946.2.diff

src/wp-includes/post.php

@@ -2817 +2817 @@
         }
 
         // If the post date is empty (due to having been new or a draft) and status is not 'draft' or 'pending', set date to now
-        if ( empty($post_date) || '0000-00-00 00:00:00' == $post_date )
-                $post_date = current_time('mysql');
+        if ( empty($post_date) || '0000-00-00 00:00:00' == $post_date ) {
+                if ( empty($post_date_gmt) || '0000-00-00 00:00:00' == $post_date_gmt )
+                        $post_date = current_time('mysql');
+                else
+                        $post_date = get_date_from_gmt($post_date_gmt);
+        }
 
                 // validate the date
                 $mm = substr( $post_date, 5, 2 );
@@ -2839 +2843 @@
                         $post_date_gmt = '0000-00-00 00:00:00';
         }
 
-        if ( $update || '0000-00-00 00:00:00' == $post_date ) {
+        if ( $update ) {
                 $post_modified     = current_time( 'mysql' );
                 $post_modified_gmt = current_time( 'mysql', 1 );
         } else {

tests/phpunit/tests/post.php

@@ -865 +865 @@
                 $this->assertEquals( 9, $after_trash_counts->publish );
                 $this->assertNotEquals( $initial_counts->publish, $after_trash_counts->publish );
         }
+
+        function test_wp_insert_post_should_respect_post_date_gmt() {
+                $post = array(
+                        'post_author' => $this->author_id,
+                        'post_status' => 'publish',
+                        'post_content' => rand_str(),
+                        'post_title' => rand_str(),
+                        'post_date_gmt' => '2014-01-01 12:00:00',
+                );
+
+                // insert a post and make sure the ID is ok
+                $id = wp_insert_post($post);
+
+                $out = get_post($id);
+
+                $this->assertEquals($post['post_content'], $out->post_content);
+                $this->assertEquals($post['post_title'], $out->post_title);
+                $this->assertEquals($post['post_author'], $out->post_author);
+                $this->assertEquals(get_date_from_gmt($post['post_date_gmt']), $out->post_date);
+                $this->assertEquals($post['post_date_gmt'], $out->post_date_gmt);
+        }
 }