Ticket #38883: 38883.diff

src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -1324 +1324 @@
                 }
 
                 if ( ! empty( $schema['properties']['date_gmt'] ) ) {
-                        $data['date_gmt'] = $this->prepare_date_response( $post->post_date_gmt );
+                        // For drafts, date_gmt will not be set, in which case shim the value based off
+                        // the date field with offsets applied.
+                        if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
+                                $post_date_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_date ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                        } else {
+                                $post_date_gmt = $post->post_date_gmt;
+                        }
+                        $data['date_gmt'] = $this->prepare_date_response( $post_date_gmt );
                 }
 
                 if ( ! empty( $schema['properties']['guid'] ) ) {
@@ -1340 +1347 @@
                 }
 
                 if ( ! empty( $schema['properties']['modified_gmt'] ) ) {
-                        $data['modified_gmt'] = $this->prepare_date_response( $post->post_modified_gmt );
+                        // For drafts, date_gmt will not be set, in which case shim the value based off
+                        // the date field with offsets applied.
+                        if ( '0000-00-00 00:00:00' === $post->post_modified_gmt ) {
+                                $post_modified_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_modified ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                        } else {
+                                $post_modified_gmt = $post->post_modified_gmt;
+                        }
+                        $data['modified_gmt'] = $this->prepare_date_response( $post_modified_gmt );
                 }
 
                 if ( ! empty( $schema['properties']['password'] ) ) {

tests/phpunit/includes/testcase-rest-post-type-controller.php

@@ -10 +10 @@
                 $this->assertEquals( $post->post_name, $data['slug'] );
                 $this->assertEquals( get_permalink( $post->ID ), $data['link'] );
                 if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
-                        $this->assertNull( $data['date_gmt'] );
+                        $post_date_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_date ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                        $this->assertEquals( mysql_to_rfc3339( $post_date_gmt ), $data['date_gmt'] );
                 }
                 $this->assertEquals( mysql_to_rfc3339( $post->post_date ), $data['date'] );
 
                 if ( '0000-00-00 00:00:00' === $post->post_modified_gmt ) {
-                        $this->assertNull( $data['modified_gmt'] );
+                        $post_modified_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_modified ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                        $this->assertEquals( mysql_to_rfc3339( $post_modified_gmt ), $data['modified_gmt'] );
                 }
                 $this->assertEquals( mysql_to_rfc3339( $post->post_modified ), $data['modified'] );
 
@@ -141 +143 @@
                         $this->assertEquals( $post->post_status, $data['status'] );
 
                         if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
-                                $this->assertNull( $data['date_gmt'] );
+                                $post_date_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_date ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                                $this->assertEquals( mysql_to_rfc3339( $post_date_gmt ), $data['date_gmt'] );
                         } else {
                                 $this->assertEquals( mysql_to_rfc3339( $post->post_date_gmt ), $data['date_gmt'] );
                         }
 
                         if ( '0000-00-00 00:00:00' === $post->post_modified_gmt ) {
-                                $this->assertNull( $data['modified_gmt'] );
+                                $post_modified_gmt = date( 'Y-m-d H:i:s', strtotime( $post->post_modified ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                                $this->assertEquals( mysql_to_rfc3339( $post_modified_gmt ), $data['modified_gmt'] );
                         } else {
                                 $this->assertEquals( mysql_to_rfc3339( $post->post_modified_gmt ), $data['modified_gmt'] );
                         }

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -1176 +1176 @@
                 $new_post = get_post( $data['id'] );
                 $this->assertEquals( 'draft', $data['status'] );
                 $this->assertEquals( 'draft', $new_post->post_status );
-                // Confirm dates are null
-                $this->assertNull( $data['date_gmt'] );
-                $this->assertNull( $data['modified_gmt'] );
+                // Confirm dates are shimmed for gmt_offset
+                $post_modified_gmt = date( 'Y-m-d H:i:s', strtotime( $new_post->post_modified ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+                $post_date_gmt = date( 'Y-m-d H:i:s', strtotime( $new_post->post_date ) + ( get_option( 'gmt_offset' ) * 3600 ) );
+
+                $this->assertEquals( mysql_to_rfc3339( $post_modified_gmt ), $data['modified_gmt'] );
+                $this->assertEquals( mysql_to_rfc3339( $post_date_gmt ), $data['date_gmt'] );
         }
 
         public function test_create_post_private() {