vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve support for ordering WP_Query results by postmeta.

Browse Source 
`WP_Meta_Query` clauses now support a 'name' parameter. When building a
`WP_Query` object, the value of 'orderby' can reference this 'name', so that
it's possible to order by any clause in a meta_query, not just the first one
(as when using 'orderby=meta_value'). This improvement also makes it possible
to order by multiple meta query clauses (or by any other eligible field plus
a meta query clause), using the array syntax for 'orderby' introduced in [29027].

Props Funkatronic, boonebgorges.
Fixes #31045.

git-svn-id: https://develop.svn.wordpress.org/trunk@31312 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2015-01-31 15:47:51 +00:00
parent f36af772ea
commit 2d737796d2
3 changed files with 158 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/wp-includes/query.php
View File

@@ -2233,8 +2233,9 @@ class WP_Query {
$primary_meta_key = '';
$primary_meta_query = false;
if ( ! empty( $this->meta_query->queries ) ) {
$primary_meta_query = reset( $this->meta_query->queries );
$meta_clauses = $this->meta_query->get_clauses();
if ( ! empty( $meta_clauses ) ) {
$primary_meta_query = reset( $meta_clauses );
if ( ! empty( $primary_meta_query['key'] ) ) {
$primary_meta_key = $primary_meta_query['key'];
@@ -2243,6 +2244,7 @@ class WP_Query {
$allowed_keys[] = 'meta_value';
$allowed_keys[] = 'meta_value_num';
$allowed_keys = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
}
if ( ! in_array( $orderby, $allowed_keys ) ) {
@@ -2260,29 +2262,36 @@ class WP_Query {
case 'ID':
case 'menu_order':
case 'comment_count':
$orderby = "$wpdb->posts.{$orderby}";
$orderby_clause = "$wpdb->posts.{$orderby}";
break;
case 'rand':
$orderby = 'RAND()';
$orderby_clause = 'RAND()';
break;
case $primary_meta_key:
case 'meta_value':
if ( ! empty( $primary_meta_query['type'] ) ) {
$sql_type = $this->meta_query->get_cast_for_type( $primary_meta_query['type'] );
$orderby = "CAST($wpdb->postmeta.meta_value AS {$sql_type})";
$orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
} else {
$orderby = "$wpdb->postmeta.meta_value";
$orderby_clause = "{$primary_meta_query['alias']}.meta_value";
}
break;
case 'meta_value_num':
$orderby = "$wpdb->postmeta.meta_value+0";
$orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
break;
default:
$orderby = "$wpdb->posts.post_" . $orderby;
if ( array_key_exists( $orderby, $meta_clauses ) ) {
// $orderby corresponds to a meta_query clause.
$meta_clause = $meta_clauses[ $orderby ];
$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
} else {
// Default: order by post field.
$orderby_clause = "$wpdb->posts.post_" . sanitize_key( $orderby );
}
break;
}
return $orderby;
return $orderby_clause;
}
/**
@@ -2813,6 +2822,12 @@ class WP_Query {
$where .= $search . $whichauthor . $whichmimetype;
if ( ! empty( $this->meta_query->queries ) ) {
$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
$join .= $clauses['join'];
$where .= $clauses['where'];
}
$rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
if ( ! isset( $q['order'] ) ) {
$q['order'] = $rand ? '' : 'DESC';
@@ -3030,12 +3045,6 @@ class WP_Query {
$where .= ')';
}
if ( !empty( $this->meta_query->queries ) ) {
$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
$join .= $clauses['join'];
$where .= $clauses['where'];
}
/*
* Apply filters on where and join prior to paging so that any
* manipulations to them are reflected in the paging by day queries.