Changeset 33281

Timestamp:

07/15/2015 07:57:47 PM (9 years ago)

Author:

obenland

Message:

Feeds: Revert [32765] because of objections raised in #4575.

Location:

trunk/src/wp-includes

Files:

• feed-rss2-comments.php (modified) (1 diff)
• feed-rss2.php (modified) (1 diff)
• feed.php (modified) (1 diff)

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

@@ -44 +44 @@
     <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_lastcommentmodified('GMT')); ?></lastBuildDate>
     <sy:updatePeriod><?php
         /** This filter is documented in wp-includes/feed-rss2.php */

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

@@ -43 +43 @@
     <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_lastpostmodified('GMT'), false); ?></lastBuildDate>
     <language><?php bloginfo_rss( 'language' ); ?></language>
     <sy:updatePeriod><?php

trunk/src/wp-includes/feed.php

@@ -86 +86 @@
     $default_feed = apply_filters( 'default_feed', 'rss2' );
     return 'rss' == $default_feed ? 'rss2' : $default_feed;
-}
-
-/**
- * Gets the timestamp of the most recently modified post from WP_Query.
- *
- * If viewing a comment feed, the date of the most recently modified
- * comment will be returned.
- *
- * @since 4.3.0
- *
- * @return string Date ('Y-m-d H:i:s' for use with mysql2date()).
- */
-function get_last_build_date_feed() {
-    global $wp_query, $wpdb;
-
-    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 );
-        $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 ) );
-
-            return max( $max_post_time, $max_comment_time );
-        }
-        return $max_post_time;
-    }
-
-    // Fallback to last time any post was modified or published.
-    return get_lastpostmodified( 'GMT' );
 }