Changeset 46977

Timestamp:

12/17/2019 08:52:44 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Ensure that get_feed_build_date() correctly handles a modified post object with invalid date.

• Clarify in the documentation that the function returns false on failure.
• Consistently pass the return value through the get_feed_build_date filter.

Props Rarst, dd32, azaozz, tellyworth.
Merges [46974] and [46973] to the 5.3 branch.
Fixes #48957.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-includes/feed.php (modified) (3 diffs)
• src/wp-includes/post.php (modified) (5 diffs)
• tests/phpunit/tests/date/getFeedBuildDate.php (modified) (1 diff)

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

@@ -650 +650 @@
 
 /**
- * Get the timestamp of the most recently modified post from WP_Query.
- *
- * If viewing a comment feed, the timestamp of the most recently modified
+ * Get the UTC time of the most recently modified post from WP_Query.
+ *
+ * If viewing a comment feed, the time of the most recently modified
  * comment will be returned.
  *
@@ -659 +659 @@
  * @since 5.2.0
  *
- * @param string $format Format of the timestamp to return, passed to mysql2date.
- *
- * @return string The timestamp.
+ * @param string $format Date format string to return the time in.
+ * @return string|false The time in requested format, or false on failure.
  */
 function get_feed_build_date( $format ) {
     global $wp_query;
 
-    if ( empty( $wp_query ) || ! $wp_query->have_posts() ) {
-        // Fallback to last time any post was modified or published.
-        return get_lastpostmodified( 'GMT' );
-    }
-
-    // Extract the post modified times from the posts.
-    $modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
-
-    // If this is a comment feed, check those objects too.
-    if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
-        // Extract the comment modified times from the comments.
-        $comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
-
-        // Add the comment times to the post times for comparison.
-        $modified_times = array_merge( $modified_times, $comment_times );
-    }
-
-    // Determine the maximum modified time.
-    $datetime = date_create_immutable_from_format(
-        'Y-m-d H:i:s',
-        max( $modified_times ),
-        new DateTimeZone( 'UTC' )
-    );
-
-    $max_modified_time = $datetime->format( $format );
+    $datetime          = false;
+    $max_modified_time = false;
+    $utc               = new DateTimeZone( 'UTC' );
+
+    if ( ! empty( $wp_query ) && $wp_query->have_posts() ) {
+        // Extract the post modified times from the posts.
+        $modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
+
+        // If this is a comment feed, check those objects too.
+        if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
+            // Extract the comment modified times from the comments.
+            $comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
+
+            // Add the comment times to the post times for comparison.
+            $modified_times = array_merge( $modified_times, $comment_times );
+        }
+
+        // Determine the maximum modified time.
+        $datetime = date_create_immutable_from_format( 'Y-m-d H:i:s', max( $modified_times ), $utc );
+    }
+
+    if ( false === $datetime ) {
+        // Fall back to last time any post was modified or published.
+        $datetime = date_create_immutable_from_format( 'Y-m-d H:i:s', get_lastpostmodified( 'GMT' ), $utc );
+    }
+
+    if ( false !== $datetime ) {
+        $max_modified_time = $datetime->format( $format );
+    }
 
     /**
@@ -697 +700 @@
      * @since 5.2.0
      *
-     * @param string $max_modified_time Date the last post or comment was modified in the query.
-     * @param string $format            The date format requested in get_feed_build_date.
+     * @param string|false $max_modified_time Date the last post or comment was modified in the query, in UTC.
+     *                                        False on failure.
+     * @param string       $format            The date format requested in get_feed_build_date().
      */
     return apply_filters( 'get_feed_build_date', $max_modified_time, $format );

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

@@ -6387 +6387 @@
  *                          Default 'server'.
  * @param string $post_type Optional. The post type to check. Default 'any'.
- * @return string The date of the last post.
+ * @return string The date of the last post, or false on failure.
  */
 function get_lastpostdate( $timezone = 'server', $post_type = 'any' ) {
@@ -6395 +6395 @@
      * @since 2.3.0
      *
-     * @param string $date     Date the last post was published.
-     * @param string $timezone Location to use for getting the post published date.
-     *                         See get_lastpostdate() for accepted `$timezone` values.
+     * @param string|false $date     Date the last post was published. False on failure.
+     * @param string       $timezone Location to use for getting the post published date.
+     *                               See get_lastpostdate() for accepted `$timezone` values.
      */
     return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date', $post_type ), $timezone );
@@ -6416 +6416 @@
  *                          Default 'server'.
  * @param string $post_type Optional. The post type to check. Default 'any'.
- * @return string The timestamp in 'Y-m-d H:i:s' format.
+ * @return string The timestamp in 'Y-m-d H:i:s' format, or false on failure.
  */
 function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) {
@@ -6447 +6447 @@
      * @since 2.3.0
      *
-     * @param string $lastpostmodified The most recent time that a post was modified, in 'Y-m-d H:i:s' format.
-     * @param string $timezone         Location to use for getting the post modified date.
-     *                                 See get_lastpostdate() for accepted `$timezone` values.
+     * @param string|false $lastpostmodified The most recent time that a post was modified, in 'Y-m-d H:i:s' format.
+     *                                       False on failure.
+     * @param string       $timezone         Location to use for getting the post modified date.
+     *                                       See get_lastpostdate() for accepted `$timezone` values.
      */
     return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
@@ -6467 +6468 @@
  * @param string $field     Post field to check. Accepts 'date' or 'modified'.
  * @param string $post_type Optional. The post type to check. Default 'any'.
- * @return string|false The timestamp in 'Y-m-d H:i:s' format, or false on error.
+ * @return string|false The timestamp in 'Y-m-d H:i:s' format, or false on failure.
  */
 function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {

branches/5.3/tests/phpunit/tests/date/getFeedBuildDate.php

@@ -37 +37 @@
         $this->assertEquals( '2018-07-23T03:13:23+00:00', get_feed_build_date( DATE_RFC3339 ) );
     }
+
+    /**
+     * Test that get_feed_build_date() works with invalid post dates.
+     *
+     * @ticket 48957
+     */
+    public function test_should_fall_back_to_last_post_modified() {
+        global $wp_query;
+
+        update_option( 'timezone_string', 'Europe/Kiev' );
+        $datetime     = new DateTimeImmutable( 'now', wp_timezone() );
+        $datetime_utc = $datetime->setTimezone( new DateTimeZone( 'UTC' ) );
+
+        $wp_query->posts = array();
+
+        $this->assertFalse( get_feed_build_date( DATE_RFC3339 ), 'False when unable to determine valid time' );
+
+        $this->factory->post->create(
+            array(
+                'post_date' => $datetime->format( 'Y-m-d H:i:s' ),
+            )
+        );
+
+        $this->assertEquals(
+            $datetime_utc->format( DATE_RFC3339 ),
+            get_feed_build_date( DATE_RFC3339 ),
+            'Fall back to time of last post modified with no posts'
+        );
+
+        $post_id_broken = $this->factory->post->create();
+        $post_broken    = get_post( $post_id_broken );
+
+        $post_broken->post_modified_gmt = 0;
+
+        $wp_query->posts = array( $post_broken );
+
+        $this->assertEquals(
+            $datetime_utc->format( DATE_RFC3339 ),
+            get_feed_build_date( DATE_RFC3339 ),
+            'Fall back to time of last post modified with broken post object'
+        );
+    }
 }