Ticket #20262: 20262.3.diff

src/wp-includes/comment.php

@@ -3052 +3052 @@
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-        if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+        if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) || $posts[0]->post_status !== 'publish' ) {
                 return $posts;
+        }
 
         /**
          * Filter the list of post types to automatically close comments for.
@@ -3089 +3090 @@
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-        if ( ! $open )
+        if ( ! $open ) {
                 return $open;
+        }
 
-        if ( !get_option('close_comments_for_old_posts') )
+        if ( ! get_option('close_comments_for_old_posts' ) ) {
                 return $open;
+        }
 
         $days_old = (int) get_option('close_comments_days_old');
-        if ( !$days_old )
+        if ( !$days_old ) {
                 return $open;
+        }
 
         $post = get_post($post_id);
+
+        if ( $post->post_status !== 'publish' ) {
+                return $open;
+        }
 
         /** This filter is documented in wp-includes/comment.php */
         $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-        if ( ! in_array( $post->post_type, $post_types ) )
+        if ( ! in_array( $post->post_type, $post_types ) ) {
                 return $open;
+        }
 
-        if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+        if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
                 return false;
+        }
 
         return $open;
 }