Ticket #17264: 17264.diff

wp-includes/meta.php

@@ -492 +492 @@
                         elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
                                 $meta_type = 'CHAR';
 
-                        if ( empty( $meta_key ) && empty( $meta_value ) )
-                                continue;
-
                         $alias = $i ? 'mt' . $i : $meta_table;
 
                         $join .= "\nINNER JOIN $meta_table";
@@ -503 +500 @@
 
                         $i++;
 
+                        $where[$k] = '';
                         if ( !empty( $meta_key ) )
                                 $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
 
@@ -514 +512 @@
                                 if ( ! is_array( $meta_value ) )
                                         $meta_value = preg_split( '/[,\s]+/', $meta_value );
 
-                                if ( empty( $meta_value ) )
+                                if ( empty( $meta_value ) ) {
                                         continue;
+                                } else {
+                                        $where[$k] .= ' AND';
+                                }
                         } else {
                                 $meta_value = trim( $meta_value );
                         }
@@ -532 +533 @@
                                 $meta_compare_string = '%s';
                         }
 
-                        $where[$k] = ' (' . $where[$k] . $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
+                        $where[$k] = ' (' . $where[$k] . $wpdb->prepare( " CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
                 }
                 $where = ' AND (' . implode( " {$this->relation} ", $where ) . ' )';