Ticket #12668: 12668-get_approved_comments-WP_COMMENT_QUERY.patch

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -58 +58 @@
                 if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
                         $comment_status = 'all';
 
-                $comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
+                $comment_type = ! empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : array( 'pingback', 'trackback', 'comment' );
 
                 $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
@@ -108 +108 @@
                         'type' => $comment_type,
                         'orderby' => $orderby,
                         'order' => $order,
-                        'post_type' => $post_type,
+                        'post_type' => $post_type
                 );
 
                 $_comments = get_comments( $args );

src/wp-admin/includes/dashboard.php

@@ -752 +752 @@
 
         $comments_query = array(
                 'number' => $total_items * 5,
-                'offset' => 0
+                'offset' => 0,
+                'type'   => array( 'pingback', 'trackback', 'comment' )
         );
         if ( ! current_user_can( 'edit_posts' ) )
                 $comments_query['status'] = 'approve';

src/wp-includes/comment.php

@@ -131 +131 @@
  * @uses $wpdb
  *
  * @param int $post_id The ID of the post
+ * @param array $args WP_Comment_Query args
  * @return array $comments The approved comments
  */
-function get_approved_comments($post_id) {
-        global $wpdb;
-        return $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1' ORDER BY comment_date", $post_id));
+function get_approved_comments( $post_id = 0, $args = array() ) {
+        $defaults = array(
+                'status' => 1,
+                'post_id' => $post_id
+        );
+        $r = wp_parse_args( $args, $defaults );
+
+        $query = new WP_Comment_Query;
+        return $query->query( $r );
 }
 
 /**
@@ -447 +454 @@
                 } elseif( 'pings' == $this->query_vars['type'] ) {
                         $where .= ' AND comment_type IN ("pingback", "trackback")';
                 } elseif ( ! empty( $this->query_vars['type'] ) ) {
-                        $where .= $wpdb->prepare( ' AND comment_type = %s', $this->query_vars['type'] );
+                        if ( is_array( $this->query_vars['type'] ) ) {
+                                $where .= ' AND comment_type IN (' . implode( ',', $this->query_vars['type'] ) . ')';
+                        } elseif ( '' !== $this->query_vars['type'] ) {
+                                $where .= $wpdb->prepare( ' AND comment_type = %d', $this->query_vars['type'] );
+                        }
                 }
 
                 if ( '' !== $this->query_vars['parent'] ) {

src/wp-includes/default-widgets.php

@@ -856 +856 @@
                 $comments = get_comments( apply_filters( 'widget_comments_args', array(
                         'number'      => $number,
                         'status'      => 'approve',
-                        'post_status' => 'publish'
+                        'post_status' => 'publish',
+                        'type'        => array( 'pingback', 'trackback', 'comment' )
                 ) ) );
 
                 $output .= $args['before_widget'];