Ticket #4575: 4575_6.diff

src/wp-includes/feed-atom-comments.php

@@ -37 +37 @@
         ?></title>
         <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
 
-        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT'), false); ?></updated>
+        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_build_date(), false); ?></updated>
 
 <?php if ( is_singular() ) { ?>
         <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />

src/wp-includes/feed-atom.php

@@ -30 +30 @@
         <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
         <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 
-        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
+        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_build_date(), false); ?></updated>
 
         <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url') ?>" />
         <id><?php bloginfo('atom_url'); ?></id>

src/wp-includes/feed-rss2-comments.php

@@ -43 +43 @@
         <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
         <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
         <description><?php bloginfo_rss("description") ?></description>
-        <lastBuildDate><?php echo mysql2date('r', get_last_build_date_feed(), false ); ?></lastBuildDate>
+        <lastBuildDate><?php echo mysql2date('r', get_last_build_date(), false ); ?></lastBuildDate>
         <sy:updatePeriod><?php
                 /** This filter is documented in wp-includes/feed-rss2.php */
                 echo apply_filters( 'rss_update_period', 'hourly' );

src/wp-includes/feed-rss2.php

@@ -42 +42 @@
         <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
         <link><?php bloginfo_rss('url') ?></link>
         <description><?php bloginfo_rss("description") ?></description>
-        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_last_build_date_feed(), false); ?></lastBuildDate>
+        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_last_build_date(), false); ?></lastBuildDate>
         <language><?php bloginfo_rss( 'language' ); ?></language>
         <sy:updatePeriod><?php
                 $duration = 'hourly';

src/wp-includes/feed.php

@@ -97 +97 @@
  *
  * @return string Date ('Y-m-d H:i:s' for use with mysql2date() )
  */
-function get_last_build_date_feed() {
-        global $wp_query, $wpdb;
+function get_last_build_date() {
+        global $wp_query;
 
         if ( $wp_query->have_posts() ) {
-                $post_ids = array();
-                $post_times = array();
-                foreach( $wp_query->posts as $post ) {
-                        $post_ids[] = $post->ID;
-                        $post_times[] = $post->post_modified_gmt;
-                }
-                $postids = implode( "','", $post_ids );
+                // Determine max post time
+                $post_ids = wp_list_pluck( $wp_query->posts, 'ID' );
+                $post_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
                 $max_post_time = max( $post_times );
 
-                if ( $wp_query->is_comment_feed() ) {
-                        $max_comment_time = $wpdb->get_var( $wpdb->prepare( "SELECT MAX(comment_date_gmt) FROM $wpdb->comments WHERE comment_post_ID IN ('%s') AND comment_approved = '1'", $postids ) );
+                // If this is a comment feed, we want to check those objects too
+                if( $wp_query->is_comment_feed() && $wp_query->have_comments() ) {
+                        $comments_query = new WP_Comment_Query;
+                        $comments = $comments_query->query( array(
+                                'post__in' => $post_ids
+                         ) );
 
+                        // Determine max comment time
+                        $comment_times = wp_list_pluck( $comments, 'comment_date_gmt' );
+                        $max_comment_time = max( $comment_times );
+
+                        // Return the most recent timestamp between posts and comments
                         return max( $max_post_time, $max_comment_time );
                 }
+                // Return the most recent post timestamp if there are no comments to consider
                 return $max_post_time;
         }
 
-        // Fallback to last time any post was modified or published.
+        // Fallback to last time any post was modified or published
         return get_lastpostmodified( 'GMT' );
 }