Changeset 30084

Timestamp:

10/29/2014 02:21:10 AM (10 years ago)

Author:

boonebgorges

Message:

Support multiple 'status' values in WP_Comment_Query.

This change required turning the SQL concatenation into the generation of an
array, for greater flexibility.

Props karpstrucking, ebinnion.
Fixes #29612.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (12 diffs)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -303 +303 @@
             'post_status' => '',
             'post_type' => '',
-            'status' => '',
+            'status' => '',
             'type' => '',
             'user_id' => '',
@@ -344 +344 @@
         }
 
+
+
         // Assemble clauses related to 'comment_approved'.
         $approved_clauses = array();
-        $status = $this->query_vars['status'];
-        if ( 'hold' == $status ) {
-            $approved_clauses[] = "comment_approved = '0'";
-        } elseif ( 'approve' == $status ) {
-            $approved_clauses[] = "comment_approved = '1'";
-        } elseif ( ! empty( $status ) && 'all' != $status ) {
-            $approved_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
-        } else {
-            $approved_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
+
+        // 'status' accepts an array or a comma-separated string.
+        $status_clauses = array();
+        $statuses = $this->query_vars['status'];
+        if ( ! is_array( $statuses ) ) {
+            $statuses = preg_split( '/[\s,]+/', $statuses );
+        }
+
+        // Remove empty statuses.
+        $statuses = array_filter( $statuses );
+
+        // 'any' overrides other statuses.
+        if ( ! in_array( 'any', $statuses ) ) {
+            foreach ( $statuses as $status ) {
+                switch ( $status ) {
+                    case 'hold' :
+                        $status_clauses[] = "comment_approved = '0'";
+                        break;
+
+                    case 'approve' :
+                        $status_clauses[] = "comment_approved = '1'";
+                        break;
+
+                    case 'all' :
+                        $status_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
+                        break;
+
+                    default :
+                        $status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+                        break;
+                }
+            }
+
+            if ( ! empty( $status_clauses ) ) {
+                $approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+            }
         }
 
@@ -380 +409 @@
 
         // Collapse comment_approved clauses into a single OR-separated clause.
-        if ( 1 === count( $approved_clauses ) ) {
-            $approved = $approved_clauses[0];
-        } else {
-            $approved = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+        if ( ! empty( $approved_clauses ) ) {
+            if ( 1 === count( $approved_clauses ) ) {
+                $where[] = $approved_clauses[0];
+            } else {
+                $where[] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+            }
         }
 
@@ -458 +489 @@
 
         $join = '';
-        $where = $approved;
 
         $post_id = absint( $this->query_vars['post_id'] );
         if ( ! empty( $post_id ) ) {
-            $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
+            $wherecomment_post_ID = %d', $post_id );
         }
 
         // Parse comment IDs for an IN clause.
         if ( ! empty( $this->query_vars['comment__in'] ) ) {
-            $where .= ' AND comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+            $wherecomment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
         }
 
         // Parse comment IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-            $where .= ' AND comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+            $wherecomment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
         }
 
         // Parse comment post IDs for an IN clause.
         if ( ! empty( $this->query_vars['post__in'] ) ) {
-            $where .= ' AND comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+            $wherecomment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
         }
 
         // Parse comment post IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['post__not_in'] ) ) {
-            $where .= ' AND comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+            $wherecomment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
         }
 
         if ( '' !== $this->query_vars['author_email'] ) {
-            $where .= $wpdb->prepare( ' AND comment_author_email = %s', $this->query_vars['author_email'] );
+            $wherecomment_author_email = %s', $this->query_vars['author_email'] );
         }
 
         if ( '' !== $this->query_vars['karma'] ) {
-            $where .= $wpdb->prepare( ' AND comment_karma = %d', $this->query_vars['karma'] );
+            $wherecomment_karma = %d', $this->query_vars['karma'] );
         }
 
         if ( 'comment' == $this->query_vars['type'] ) {
-            $where .= " AND comment_type = ''";
+            $wherecomment_type = ''";
         } elseif( 'pings' == $this->query_vars['type'] ) {
-            $where .= ' AND comment_type IN ("pingback", "trackback")';
+            $wherecomment_type IN ("pingback", "trackback")';
         } elseif ( ! empty( $this->query_vars['type'] ) ) {
-            $where .= $wpdb->prepare( ' AND comment_type = %s', $this->query_vars['type'] );
+            $wherecomment_type = %s', $this->query_vars['type'] );
         }
 
         if ( '' !== $this->query_vars['parent'] ) {
-            $where .= $wpdb->prepare( ' AND comment_parent = %d', $this->query_vars['parent'] );
+            $wherecomment_parent = %d', $this->query_vars['parent'] );
         }
 
         if ( is_array( $this->query_vars['user_id'] ) ) {
-            $where .= ' AND user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
+            $whereuser_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
         } elseif ( '' !== $this->query_vars['user_id'] ) {
-            $where .= $wpdb->prepare( ' AND user_id = %d', $this->query_vars['user_id'] );
+            $whereuser_id = %d', $this->query_vars['user_id'] );
         }
 
         if ( '' !== $this->query_vars['search'] ) {
-            $where .= $this->get_search_sql(
+            $= $this->get_search_sql(
                 $this->query_vars['search'],
                 array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
             );
+
+
+
         }
 
@@ -526 +559 @@
             $join_posts_table = true;
             foreach ( $post_fields as $field_name => $field_value ) {
-                $where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
+                $where {$wpdb->posts}.{$field_name} = %s", $field_value );
             }
         }
@@ -532 +565 @@
         // Comment author IDs for an IN clause.
         if ( ! empty( $this->query_vars['author__in'] ) ) {
-            $where .= ' AND user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
+            $whereuser_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
         }
 
         // Comment author IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['author__not_in'] ) ) {
-            $where .= ' AND user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
+            $whereuser_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
         }
 
@@ -543 +576 @@
         if ( ! empty( $this->query_vars['post_author__in'] ) ) {
             $join_posts_table = true;
-            $where .= ' AND post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
+            $wherepost_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
         }
 
@@ -549 +582 @@
         if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
             $join_posts_table = true;
-            $where .= ' AND post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
+            $wherepost_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
         }
 
@@ -559 +592 @@
             $clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
             $join .= $clauses['join'];
-            $where .= $clauses['where'];
+
+            // Strip leading 'AND'.
+            $where[] = preg_replace( '/^\s*AND\s*/', '', $clauses['where'] );
 
             if ( ! $this->query_vars['count'] ) {
@@ -569 +604 @@
         if ( ! empty( $date_query ) && is_array( $date_query ) ) {
             $date_query_object = new WP_Date_Query( $date_query, 'comment_date' );
-            $where .= $date_query_object->get_sql();
-        }
+            $where[] = preg_replace( '/^\s*AND\s*/', '', $date_query_object->get_sql() );
+        }
+
+        $where = implode( ' AND ', $where );
 
         $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );
@@ -591 +628 @@
         $groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
 
+
+
+
+
         if ( $groupby ) {
             $groupby = 'GROUP BY ' . $groupby;
@@ -599 +640 @@
         }
 
-        $this->request = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby $orderby $limits";
+        $this->request = "SELECT $fields FROM $wpdb->comments $join $where $groupby $orderby $limits";
 
         if ( $this->query_vars['count'] ) {

trunk/tests/phpunit/tests/comment/query.php

@@ -74 +74 @@
 
         $this->assertEqualSets( array( $c1, $c3 ), $found );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }