From 9cbad29eb813b78df8c2d8f0492ea74cda2b537e Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 27 Aug 2014 20:23:16 +0000 Subject: [PATCH] Meta Query: Revert [28659] (and [28665]) due to regressions. props boonebgorges. fixes #29285. see #25538. Built from https://develop.svn.wordpress.org/trunk@29650 git-svn-id: http://core.svn.wordpress.org/trunk@29424 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/meta.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/wp-includes/meta.php b/wp-includes/meta.php index 9b1b5b0020..e3c43cffe6 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -1011,7 +1011,6 @@ class WP_Meta_Query { $where["key-only-$key"] = $wpdb->prepare( "$meta_table.meta_key = %s", trim( $q['key'] ) ); } - $where_meta_key = array(); foreach ( $queries as $k => $q ) { $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : ''; $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' ); @@ -1054,18 +1053,12 @@ class WP_Meta_Query { $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)"; $where[$k] = ''; - if ( ! empty( $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 ( !empty( $meta_key ) ) + $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key ); if ( is_null( $meta_value ) ) { - if ( empty( $where[$k] ) && empty( $where_meta_key ) ) { + if ( empty( $where[$k] ) ) unset( $join[$i] ); - } continue; } @@ -1106,10 +1099,6 @@ class WP_Meta_Query { else $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )'; - if ( ! empty( $where_meta_key ) ) { - $where .= "\nAND (" . implode( "\nAND ", $where_meta_key ) . ' )'; - } - $join = implode( "\n", $join ); if ( ! empty( $join ) ) $join = ' ' . $join;