Changeset 36486 for trunk/src/wp-includes/class-wp-comment-query.php

Timestamp:

02/06/2016 04:50:05 AM (11 years ago)

Author:

boonebgorges

Message:

Allow comments to be queried by 'any' post_type or post_status.

Props kouratoras.
Fixes #35512.

File:

• trunk/src/wp-includes/class-wp-comment-query.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -221 +221 @@
          *                                                   Default empty.
          *     @type int          $post_author               Post author ID to limit results by. Default empty.
-         *     @type string       $post_status               Post status to retrieve affiliated comments for.
-         *                                                   Default empty.
-         *     @type string       $post_type                 Post type to retrieve affiliated comments for.
-         *                                                   Default empty.
+         *     @type string|array $post_status               Post status or array of post statuses to retrieve
+         *                                                   affiliated comments for. Pass 'any' to match any value.
+         *                                                   Default empty.
+         *     @type string       $post_type                 Post type or array of post types to retrieve affiliated
+         *                                                   comments for. Pass 'any' to match any value. Default empty.
          *     @type string       $post_name                 Post name to retrieve affiliated comments for.
          *                                                   Default empty.
@@ -761 +762 @@
                 // If any post-related query vars are passed, join the posts table.
                 $join_posts_table = false;
-                $plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent', 'post_status', 'post_type' ) );
+                $plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
                 $post_fields = array_filter( $plucked );
 
@@ -770 +771 @@
                                 $esses = array_fill( 0, count( (array) $field_value ), '%s' );
                                 $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+                        }
+                }
+
+                // 'post_status' and 'post_type' are handled separately, due to the specialized behavior of 'any'.
+                foreach ( array( 'post_status', 'post_type' ) as $field_name ) {
+                        $q_values = array();
+                        if ( ! empty( $this->query_vars[ $field_name ] ) ) {
+                                $q_values = $this->query_vars[ $field_name ];
+                                if ( ! is_array( $q_values ) ) {
+                                        $q_values = explode( ',', $q_values );
+                                }
+
+                                // 'any' will cause the query var to be ignored.
+                                if ( in_array( 'any', $q_values, true ) || empty( $q_values ) ) {
+                                        continue;
+                                }
+
+                                $join_posts_table = true;
+
+                                $esses = array_fill( 0, count( $q_values ), '%s' );
+                                $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
                         }
                 }