Ticket #12668: 12668-v2-comments-query.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 );
 }
 
 /**
@@ -304 +311 @@
                         'post_type' => '',
                         'status' => '',
                         'type' => '',
+                        'type__in' => '',
+                        'type__not_in' => '',
                         'user_id' => '',
                         'search' => '',
                         'count' => false,
@@ -492 +501 @@
                         $where .= $wpdb->prepare( ' AND comment_karma = %d', $this->query_vars['karma'] );
                 }
 
-                if ( 'comment' == $this->query_vars['type'] ) {
-                        $where .= " AND comment_type = ''";
-                } 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'] );
+                // Array of comment types
+                $comment_types = ( ! is_array( $this->query_vars['type'] ) ) ? array( $this->query_vars['type'] ) : $this->query_vars['type'] ;
+                // Merge in __in array of comment types
+                $comment_types = array_merge( $comment_types, (array) $this->query_vars['type__in'] );
+                $query_types = array();
+                foreach ( $comment_types as $type ) {
+                        if ( is_array( $type ) ) {
+                                // A multi-dimensional array of comments types is unsupported.
+                                continue;
+                        }
+                        switch ( $type ) {
+                                case '': // explicit '' means all comments for backwards compatibility.
+                                        break;
+                                case 'comment':
+                                case 'comments': // alias
+                                        $query_types[] = "''";
+                                        break;
+                                case 'pings':
+                                        $query_types[] = "'pingback'"; 
+                                        $query_types[] = "'trackback'"; 
+                                        break;
+                                default:
+                                        $query_types[] = $wpdb->prepare( '%s', $type );
+                                        break;
+                        }
                 }
 
+                // Query based on comment type
+                if ( ! empty( $query_types ) ) {
+                        $where .= ' AND comment_type IN ( ' . implode( ', ', $query_types ) . ' )';
+                }
+
+                // Array of comment types to exclude
+                $excluded_comment_types = ( ! is_array( $this->query_vars['type__not_in'] ) ) ? array( $this->query_vars['type__not_in'] ) : $this->query_vars['type__not_in'] ;
+                $excluded_query_types = array();
+                foreach ( $excluded_comment_types as $type ) {
+                        if ( is_array( $type ) ) {
+                                // A multi-dimensional array of comments types is unsupported.
+                                continue;
+                        }
+                        switch ( $type ) {
+                                case '': // explicit '' means all comments for backwards compatibility.
+                                        break;
+                                case 'comment':
+                                case 'comments': // alias
+                                        $excluded_query_types[] = "''";
+                                        break;
+                                case 'pings':
+                                        $excluded_query_types[] = "'pingback'"; 
+                                        $excluded_query_types[] = "'trackback'"; 
+                                        break;
+                                default:
+                                        $excluded_query_types[] = $wpdb->prepare( '%s', $type );
+                                        break;
+                        }
+                }
+
+                // Query based on comment type
+                if ( ! empty( $excluded_query_types ) ) {
+                        $where .= ' AND comment_type NOT IN ( ' . implode( ', ', $excluded_query_types ) . ' )';
+                }
+
                 if ( '' !== $this->query_vars['parent'] ) {
                         $where .= $wpdb->prepare( ' AND comment_parent = %d', $this->query_vars['parent'] );
                 }