Ticket #16506: 16506.b.diff

wp-includes/default-widgets.php

@@ -640 +640 @@
                 if ( ! $number = absint( $instance['number'] ) )
                         $number = 5;
 
-                $comments = get_comments( array( 'number' => $number, 'status' => 'approve' ) );
+                $comments = get_comments( array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) );
                 $output .= $before_widget;
                 if ( $title )
                         $output .= $before_title . $title . $after_title;

wp-includes/comment.php

@@ -213 +213 @@
                         'parent' => '',
                         'post_ID' => '',
                         'post_id' => 0,
+                        'post_author' => '',
+                        'post_name' => '',
+                        'post_parent' => '',
+                        'post_status' => '',
+                        'post_type' => '',
                         'status' => '',
                         'type' => '',
                         'user_id' => '',
@@ -319 +324 @@
                 if ( '' !== $search )
                         $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) );
 
+                $post_fields = array_filter( compact( array( 'post_author', 'post_name', 'post_parent', 'post_status', 'post_type', ) ) );
+                if ( ! empty( $post_fields ) ) {
+                        $join = "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
+                        foreach( $post_fields as $field_name => $field_value )
+                                $where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
+                }
+
                 $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
                 $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
                 foreach ( $pieces as $piece )