WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SQL generation when `meta_query` has an `'relation' => 'OR'` for its queries and wants to `'orderby' => 'meta_value'`. 

Adds unit test.

Props jackreichert.
Fixes #25538.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-04 05:48:14 +00:00
parent a6e536fba6
commit a7c2180672
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/meta.php
View File

@ -972,6 +972,7 @@ class WP_Meta_Query {
$where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) ); $where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) );
} }
$where_meta_key = array();
foreach ( $queries as $k => $q ) { foreach ( $queries as $k => $q ) {
$meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : ''; $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
$meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' ); $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
@ -1014,12 +1015,18 @@ class WP_Meta_Query {
$join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)"; $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
$where[$k] = ''; $where[$k] = '';
if ( !empty( $meta_key ) ) if ( ! empty( $meta_key ) ) {
$where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key ); if ( isset( $q['compare'] ) ) {
$where_meta_key[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
} else {
$where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
}
}
if ( is_null( $meta_value ) ) { if ( is_null( $meta_value ) ) {
if ( empty( $where[$k] ) ) if ( empty( $where[$k] ) && empty( $where_meta_key ) ) {
unset( $join[$i] ); unset( $join[$i] );
}
continue; continue;
} }
@ -1060,6 +1067,10 @@ class WP_Meta_Query {
else else
$where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )'; $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
if ( ! empty( $where_meta_key ) ) {
$where .= "\nAND " . implode( "\nAND ", $where_meta_key );
}
$join = implode( "\n", $join ); $join = implode( "\n", $join );
if ( ! empty( $join ) ) if ( ! empty( $join ) )
$join = ' ' . $join; $join = ' ' . $join;