Changeset 29650 for trunk/src/wp-includes/meta.php

Timestamp:

08/27/2014 08:22:35 PM (12 years ago)

Author:

nacin

Message:

Meta Query: Revert [28659] (and [28665]) due to regressions.

props boonebgorges.
fixes #29285. see #25538.

File:

• trunk/src/wp-includes/meta.php (modified) (3 diffs)

trunk/src/wp-includes/meta.php

@@ -1012 +1012 @@
                 }
 
-                $where_meta_key = array();
                 foreach ( $queries as $k => $q ) {
                         $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
@@ -1055 +1054 @@
 
                         $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 +1099 @@
                 else
                         $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
-
-                if ( ! empty( $where_meta_key ) ) {
-                        $where .= "\nAND (" . implode( "\nAND ", $where_meta_key ) . ' )';
-                }
 
                 $join = implode( "\n", $join );