Changeset 24563 for trunk/wp-includes/meta.php

Timestamp:

07/05/2013 04:40:46 PM (11 years ago)

Author:

markjaquith

Message:

Prevent invalid queries in certain empty-array-passing meta_query cases.

fixes #22096. props wonderboymusic.

File:

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

trunk/wp-includes/meta.php

@@ -679 +679 @@
 
         // WP_Query sets 'meta_value' = '' by default
-        if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] )
+        if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] && ( ! is_array( $qv[ 'meta_value' ] ) || $qv[ 'meta_value' ] ) )
             $meta_query[0]['value'] = $qv[ 'meta_value' ];
 
@@ -715 +715 @@
         $queries = array();
 
+        // Split out the queries with empty arrays as value
+        foreach ( $this->queries as $k => $q ) {
+            if ( is_array( $q['value'] ) && empty( $q['value'] ) ) {
+                $key_only_queries[$k] = $q;
+                unset( $this->queries[$k] );
+            }
+        }       
+        
         // Split out the meta_key only queries (we can only do this for OR)
         if ( 'OR' == $this->relation ) {