Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

Support meta queries in WP_Comment_Query.

Browse Source 
Props nikolov.tmw
fixes #21003


git-svn-id: http://core.svn.wordpress.org/trunk@22074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-09-27 21:53:14 +00:00
parent eb54ac6373
commit 75558ab270
1 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
wp-includes/comment.php
View File

@ -190,6 +190,14 @@ function get_comments( $args = '' ) {
* @since 3.1.0
*/
class WP_Comment_Query {
/**
* Metadata query container
*
* @since 3.?
* @access public
* @var object WP_Meta_Query
*/
var $meta_query = false;
/**
* Execute the query
@ -223,9 +231,19 @@ class WP_Comment_Query {
'user_id' => '',
'search' => '',
'count' => false,
'meta_key' => '',
'meta_value' => '',
'meta_query' => '',
);
$groupby = '';
$this->query_vars = wp_parse_args( $query_vars, $defaults );
// Parse meta query
$this->meta_query = new WP_Meta_Query();
$this->meta_query->parse_query_vars( $this->query_vars );
do_action_ref_array( 'pre_get_comments', array( &$this ) );
extract( $this->query_vars, EXTR_SKIP );
@ -239,7 +257,7 @@ class WP_Comment_Query {
$cache_key = "get_comments:$key:$last_changed";
if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
return $cache;
//return $cache;
}
$post_id = absint($post_id);
@ -257,9 +275,7 @@ class WP_Comment_Query {
if ( ! empty( $orderby ) ) {
$ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
$ordersby = array_intersect(
$ordersby,
array(
$allowed_keys = array(
'comment_agent',
'comment_approved',
'comment_author',
@ -275,8 +291,20 @@ class WP_Comment_Query {
'comment_post_ID',
'comment_type',
'user_id',
)
);
if ( ! empty( $this->query_vars['meta_key'] ) ) {
$allowed_keys[] = $q['meta_key'];
$allowed_keys[] = 'meta_value';
$allowed_keys[] = 'meta_value_num';
}
$ordersby = array_intersect( $ordersby, $allowed_keys );
foreach ( $ordersby as $key => $value ) {
if ( $value == $q['meta_key'] || $value == 'meta_value' ) {
$ordersby[ $key ] = "$wpdb->commentmeta.meta_value";
} elseif ( $value == 'meta_value_num' ) {
$ordersby[ $key ] = "$wpdb->commentmeta.meta_value+0";
}
}
$orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
} else {
$orderby = 'comment_date_gmt';
@ -329,12 +357,22 @@ class WP_Comment_Query {
$where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
}
$pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
if ( ! empty( $this->meta_query->queries ) ) {
$clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
$join .= $clauses['join'];
$where .= $clauses['where'];
$groupby = "{$wpdb->comments}.comment_ID";
}
$pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );
$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
foreach ( $pieces as $piece )
$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
$query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
if ( $groupby )
$groupby = 'GROUP BY ' . $groupby;
$query = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby ORDER BY $orderby $order $limits";
if ( $count )
return $wpdb->get_var( $query );