Ticket #9611: 9611.diff

wp-includes/functions.php

@@ -1718 +1718 @@
  * If the feed action does not have a hook, then the function will die with a
  * message telling the visitor that the feed is not valid.
  *
+ * If the request is for a comment feed for a post on which comments/pings are closed
+ * then the function will die with status code 410
+ *
  * It is better to only have one hook for each feed.
  *
  * @since 2.1.0
@@ -1740 +1743 @@
                 $message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
                 wp_die( $message, '', array( 'response' => 404 ) );
         }
+        
+        if( is_comment_feed() && is_singular() && ! comments_open() && ! pings_open() )
+                wp_die( __('The feed you requested is no longer available because comments on the associated article are closed.' ), '', array( 'response' => 410 ) );
 
         do_action( $hook, $wp_query->is_comment_feed );
 }

wp-includes/general-template.php

@@ -1642 +1642 @@
         if ( is_single() || is_page() ) {
                 $post = &get_post( $id = 0 );
 
-                if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
+                if ( comments_open() || pings_open() ) {
                         $title = esc_attr(sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) ));
                         $href = get_post_comments_feed_link( $post->ID );
                 }