Changeset 15755

Timestamp:

10/08/2010 02:27:22 AM (14 years ago)

Author:

nacin

Message:

Add NOT LIKE/BETWEEN/IN. props AaronCampbell, fixes #9124.

File:

• trunk/wp-includes/classes.php (modified) (7 diffs)

trunk/wp-includes/classes.php

@@ -276 +276 @@
             if ( !empty( $this->query_vars[$wpvar] ) ) {
                 if ( ! is_array( $this->query_vars[$wpvar] ) ) {
-                    $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar]; 
+                    $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
                 } else {
                     foreach ( $this->query_vars[$wpvar] as $vkey => $v )
@@ -551 +551 @@
      * - 'key' string The meta key
      * - 'value' string|array The meta value
-     * - 'compare' (optional) string How to compare the key to the value. 
-     *      Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN'. 
+     * - 'compare' (optional) string How to compare the key to the value.
+     *      Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
      *      Default: '='
      * - 'type' string (optional) The type of the value.
-     *      Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'. 
+     *      Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
      *      Default: 'CHAR'
      *
@@ -574 +574 @@
      *      Default: 'slug'
      * - 'operator' string (optional)
-     *      Possible values: 'IN' and 'NOT IN'. 
+     *      Possible values: 'IN' and 'NOT IN'.
      *      Default: 'IN'
-     * - 'include_children' bool (optional) Wether to include child terms. 
+     * - 'include_children' bool (optional) Wether to include child terms.
      *      Default: true
      *
@@ -637 +637 @@
             $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
 
-            if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN' ) ) )
+            if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
                 $meta_compare = '=';
 
@@ -659 +659 @@
                 $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
 
-            if ( in_array( $meta_compare, array( 'IN', 'BETWEEN' ) ) ) {
+            if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
                 if ( ! is_array( $meta_value ) )
                     $meta_value = preg_split( '/[,\s]+/', $meta_value );
@@ -669 +669 @@
                 continue;
 
-            if ( 'IN' == $meta_compare ) {
+            if ( 'IN' == substr( $meta_compare, -2) ) {
                 $meta_field_types = substr( str_repeat( ',%s', count( $meta_value ) ), 1 );
                 $meta_compare_string = "($meta_field_types)";
                 unset( $meta_field_types );
-            } elseif ( 'BETWEEN' == $meta_compare ) {
+            } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) {
                 $meta_value = array_slice( $meta_value, 0, 2 );
                 $meta_compare_string = '%s AND %s';
-            } elseif ( 'LIKE' == $meta_compare ) {
+            } elseif ( 'LIKE' == substr( $meta_compare, -4 ) ) {
                 $meta_value = '%' . like_escape( $meta_value ) . '%';
                 $meta_compare_string = '%s';
@@ -709 +709 @@
 
             $query['do_query'] = false;
-            
+
             $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );