Changeset 17746

Timestamp:

04/28/2011 03:02:16 PM (13 years ago)

Author:

dd32

Message:

Properly handle querying for meta by value without a key as well as those with invalid parameters. Props scribu. See #17264

File:

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

trunk/wp-includes/meta.php

@@ -477 +477 @@
         $meta_id_column = esc_sql( $type . '_id' );
 
-        $join = '';
+        $join = array();
         $where = array();
-        $i = 0;
+
         foreach ( $this->queries as $k => $q ) {
             $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
@@ -493 +493 @@
                 $meta_type = 'CHAR';
 
-            if ( empty( $meta_key ) && empty( $meta_value ) )
-                continue;
-
+            $i = count( $join );
             $alias = $i ? 'mt' . $i : $meta_table;
 
-            $join .= "\nINNER JOIN $meta_table";
-            $join .= $i ? " AS $alias" : '';
-            $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
-
-            $i++;
-
+            // Set JOIN
+            $join[$i]  = "INNER JOIN $meta_table";
+            $join[$i] .= $i ? " AS $alias" : '';
+            $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
+
+            $where[$k] = '';
             if ( !empty( $meta_key ) )
                 $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
 
-            if ( !isset( $q['value'] ) )
+            if ( !isset( $q['value'] ) ) {
+                if ( empty( $where[$k] ) )
+                    unset( $join[$i] );
                 continue;
+            }
+
             $meta_value = $q['value'];
 
@@ -515 +517 @@
                     $meta_value = preg_split( '/[,\s]+/', $meta_value );
 
-                if ( empty( $meta_value ) )
+                if ( empty( $meta_value ) ) {
+                    unset( $join[$i] );
                     continue;
+                }
             } else {
                 $meta_value = trim( $meta_value );
@@ -533 +537 @@
             }
 
-            $where[$k] = ' (' . $where[$k] . $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
-        }
-        $where = ' AND (' . implode( " {$this->relation} ", $where ) . ' )';
+            if ( ! empty( $where[$k] ) )
+                $where[$k] .= ' AND ';
+
+            $where[$k] = ' (' . $where[$k] . $wpdb->prepare( "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
+        }
+
+        $where = array_filter( $where );
+
+        if ( empty( $where ) )
+            $where = '';
+        else
+            $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
+
+        $join = implode( "\n", $join );
+        if ( ! empty( $join ) )
+            $join = ' ' . $join;
 
         return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $this->queries, $type, $primary_table, $primary_id_column, $context ) );
     }
-
 }