Make get_meta_sql() return associative array. See #15032
git-svn-id: http://svn.automattic.com/wordpress/trunk@16053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
8e078d980c
commit
88cdfd1d90
|
@ -156,7 +156,7 @@ class WP_Object_Query {
|
||||||
unset($meta_compare_string);
|
unset($meta_compare_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array( $join, $where );
|
return compact( 'join', 'where' );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -2119,9 +2119,9 @@ class WP_Query extends WP_Object_Query {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !empty( $q['meta_query'] ) ) {
|
if ( !empty( $q['meta_query'] ) ) {
|
||||||
list( $meta_join, $meta_where ) = $this->get_meta_sql( $q['meta_query'], $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
|
$clauses = $this->get_meta_sql( $q['meta_query'], $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
|
||||||
$join .= $meta_join;
|
$join .= $clauses['join'];
|
||||||
$where .= $meta_where;
|
$where .= $clauses['where'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply filters on where and join prior to paging so that any
|
// Apply filters on where and join prior to paging so that any
|
||||||
|
|
|
@ -468,9 +468,9 @@ class WP_User_Query extends WP_Object_Query {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !empty( $qv['meta_query'] ) ) {
|
if ( !empty( $qv['meta_query'] ) ) {
|
||||||
list( $meta_join, $meta_where ) = $this->get_meta_sql( $qv['meta_query'], $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
|
$clauses = $this->get_meta_sql( $qv['meta_query'], $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
|
||||||
$this->query_from .= $meta_join;
|
$this->query_from .= $clauses['join'];
|
||||||
$this->query_where .= $meta_where;
|
$this->query_where .= $clauses['where'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !empty( $qv['include'] ) ) {
|
if ( !empty( $qv['include'] ) ) {
|
||||||
|
|
Loading…
Reference in New Issue