WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-16 11:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
Fixes #48957.
Built from https://develop.svn.wordpress.org/trunk@46974


git-svn-id: http://core.svn.wordpress.org/trunk@46774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-12-17 20:43:03 +00:00
parent 8eb278d19a
commit da041582df
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
wp-includes/feed.php
View File

@ -648,55 +648,59 @@ function self_link() {
} }
/** /**
* Get the timestamp of the most recently modified post from WP_Query. * Get the UTC time of the most recently modified post from WP_Query.
* *
* If viewing a comment feed, the timestamp of the most recently modified * If viewing a comment feed, the time of the most recently modified
* comment will be returned. * comment will be returned.
* *
* @global WP_Query $wp_query WordPress Query object. * @global WP_Query $wp_query WordPress Query object.
* *
* @since 5.2.0 * @since 5.2.0
* *
* @param string $format Format of the timestamp to return, passed to mysql2date. * @param string $format Date format string to return the time in.
* * @return string|false The time in requested format, or false on failure.
* @return string The timestamp.
*/ */
function get_feed_build_date( $format ) { function get_feed_build_date( $format ) {
global $wp_query; global $wp_query;
if ( empty( $wp_query ) || ! $wp_query->have_posts() ) { $datetime = false;
// Fallback to last time any post was modified or published. $max_modified_time = false;
return get_lastpostmodified( 'GMT' ); $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 );
} }
// Extract the post modified times from the posts. if ( false === $datetime ) {
$modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' ); // 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 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. if ( false !== $datetime ) {
$datetime = date_create_immutable_from_format( $max_modified_time = $datetime->format( $format );
'Y-m-d H:i:s', }
max( $modified_times ),
new DateTimeZone( 'UTC' )
);
$max_modified_time = $datetime->format( $format );
/** /**
* Filters the date the last post or comment in the query was modified. * Filters the date the last post or comment in the query was modified.
* *
* @since 5.2.0 * @since 5.2.0
* *
* @param string $max_modified_time Date the last post or comment was modified in the query. * @param string|false $max_modified_time Date the last post or comment was modified in the query, in UTC.
* @param string $format The date format requested in get_feed_build_date. * 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 ); return apply_filters( 'get_feed_build_date', $max_modified_time, $format );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-46973'; $wp_version = '5.4-alpha-46974';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.