Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Use the primary meta_query clause when parsing orderby in WP_Query.

Browse Source 
When using legacy `meta_key`, `meta_value`, etc. arguments in `WP_Query`,
they're converted into the first clause of a `meta_query`. By using that
clause instead of the original arguments, we make sure that behavior is
consistent between the two available formats.

props boonebgorges.
fixes #16814.

Built from https://develop.svn.wordpress.org/trunk@29855


git-svn-id: http://core.svn.wordpress.org/trunk@29618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Kovshenin 2014-10-08 15:12:20 +00:00
parent 2b88252b38
commit 5f17e0952d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/query.php
View File

@ -2223,9 +2223,16 @@ class WP_Query {
'parent', 'type', 'ID', 'menu_order', 'comment_count', 'rand',
);
$meta_key = $this->get( 'meta_key' );
if ( ! empty( $meta_key ) ) {
$allowed_keys[] = $meta_key;
$primary_meta_key = '';
$primary_meta_query = false;
if ( ! empty( $this->meta_query->queries ) ) {
$primary_meta_query = reset( $this->meta_query->queries );
if ( ! empty( $primary_meta_query['key'] ) ) {
$primary_meta_key = $primary_meta_query['key'];
$allowed_keys[] = $primary_meta_key;
}
$allowed_keys[] = 'meta_value';
$allowed_keys[] = 'meta_value_num';
}
@ -2250,12 +2257,11 @@ class WP_Query {
case 'rand':
$orderby = 'RAND()';
break;
case $meta_key:
case $primary_meta_key:
case 'meta_value':
$type = $this->get( 'meta_type' );
if ( ! empty( $type ) ) {
$meta_type = $this->meta_query->get_cast_for_type( $type );
$orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
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})";
} else {
$orderby = "$wpdb->postmeta.meta_value";
}