From e8c854d2ce27e570da905d5b421047f357b5a289 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 17 Dec 2019 02:23:51 +0000 Subject: [PATCH] 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. Fixes #48145. git-svn-id: https://develop.svn.wordpress.org/trunk@46968 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/post.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index 812be58ed8..6ffd960c72 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -3753,13 +3753,14 @@ function wp_insert_post( $postarr, $wp_error = false ) { } 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'; } }