Ticket #40136: 40136.3.diff

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

@@ -1399 +1399 @@
                         // #38883).  In this case, shim the value based on the `post_date`
                         // field with the site's timezone offset 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 ) );
+                                $post_date_gmt = get_gmt_from_date( $post->post_date );
                         } else {
                                 $post_date_gmt = $post->post_date_gmt;
                         }

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

@@ -2237 +2237 @@
 
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
         }
-
+        
         public function test_empty_post_date_gmt_shimmed_using_post_date() {
                 global $wpdb;
 
                 wp_set_current_user( self::$editor_id );
-                update_option( 'timezone_string', '' );
-                update_option( 'gmt_offset', -6 );
+                update_option( 'timezone_string', 'America/Chicago' );
 
                 // Need to set dates using wpdb directly because `wp_update_post` and
                 // `wp_insert_post` have additional validation on dates.
@@ -2288 +2287 @@
                 $this->assertEquals( $post->post_date_gmt, '2016-02-23 19:00:00' );
 
                 update_option( 'timezone_string', '' );
-                update_option( 'gmt_offset', 0 );
         }
 
         public function test_update_post_slug() {