Changeset 46975

Timestamp:

12/17/2019 08:45:18 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: In wp_insert_post(), when checking the post date to set future or publish status, use a proper delta comparison.

[3525] allowed a difference up to 59 seconds between the post date/time and the current time to consider the post published instead of scheduled, but that didn't take start of a new minute into account.

Rapidly creating post fixtures in unit tests could encounter a one-second discrepancy between current_time( 'mysql' ) and gmdate( 'Y-m-d H:i:s' ), returning values like 2019-12-16 23:43:00 vs. 2019-12-16 23:42:59, respectively, and setting the post to a future status instead of publish.

[45851], while working as intended, made the issue somewhat more likely to occur.

This caused all sorts of occasional random failures in various tests on Travis, mostly on PHP 7.1.

Merges [46968] and [46969] to the 5.3 branch.
Fixes #48145.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post.php (modified) (1 diff)

branches/5.3/src/wp-includes/post.php

@@ -3748 +3748 @@
 
     if ( 'attachment' !== $post_type ) {
+        $now = gmdate( 'Y-m-d H:i:s' );
+
         if ( 'publish' === $post_status ) {
-            // String comparison to work around far future dates (year 2038+) on 32-bit systems.
-            if ( $post_date_gmt > gmdate( 'Y-m-d H:i:59' ) ) {
+            if ( strtotime( $post_date_gmt ) - strtotime( $now ) >= MINUTE_IN_SECONDS ) {
                 $post_status = 'future';
             }
         } elseif ( 'future' === $post_status ) {
-            if ( $post_date_gmt <= gmdate( 'Y-m-d H:i:59' ) ) {
+            if ( strtotime( $post_date_gmt ) - strtotime( $now ) < MINUTE_IN_SECONDS ) {
                 $post_status = 'publish';
             }

branches/5.3/tests/phpunit/tests/post.php

@@ -636 +636 @@
 
     /**
+     * @ticket 48145
+     */
+    function test_wp_insert_post_should_default_to_publish_if_post_date_is_within_59_seconds_from_current_time() {
+        $future_date = gmdate( 'Y-m-d H:i:s', time() + 59 );
+        $post_id     = self::factory()->post->create(
+            array(
+                'post_date' => $future_date,
+            )
+        );
+
+        $post = get_post( $post_id );
+        $this->assertEquals( 'publish', $post->post_status );
+        $this->assertEquals( $future_date, $post->post_date );
+    }
+
+    /**
      * @ticket 22944
      */