Ticket #12668: 12668-comments-query.4.patch

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'] ) ) {
+                                if( in_array( 'comment', $this->query_vars['type'] ) ) {
+                                        // Default comments don't have an explicit type
++                                       $this->query_vars['type'][] = '';
++                               }
+                                $where .= ' AND comment_type IN (' . implode( ',', array_map( 'esc_sql', $this->query_vars['type'] ) . ')';
+                        } else {
+                                $where .= $wpdb->prepare( ' AND comment_type = %d', $this->query_vars['type'] );
+                        }
                 }
 
                 if ( '' !== $this->query_vars['parent'] ) {