Changeset 15730 for trunk/wp-includes/classes.php

Timestamp:

10/05/2010 11:06:20 PM (14 years ago)

Author:

scribu

Message:

further meta query optimization. props aaroncampbell. fixes #9124

File:

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

trunk/wp-includes/classes.php

@@ -553 +553 @@
      */
     function parse_meta_query( $qv ) {
-        if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
+        if ( ! empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
             $this->meta_query = $qv['meta_query'];
         }
 
         $meta_query = array();
-        foreach ( array( 'key', 'value', 'compare' ) as $key ) {
-            if ( !empty( $qv[ "meta_$key" ] ) )
+        foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
+            if ( ! empty( $qv[ "meta_$key" ] ) )
                 $meta_query[ $key ] = $qv[ "meta_$key" ];
         }
 
-        if ( !empty( $meta_query ) ) {
+        if ( ! empty( $meta_query ) ) {
             array_unshift( $this->meta_query, $meta_query );
         }
@@ -594 +594 @@
             $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', 'IN', 'BETWEEN' ) ) )
                 $meta_compare = '=';
 
-            if ( 'STRING' == $meta_type )
-                $meta_type = 'CHAR';
-            elseif ( 'NUMERIC' == $meta_type )
+            if ( 'NUMERIC' == $meta_type )
                 $meta_type = 'SIGNED';
-            elseif ( !in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
+            elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
                 $meta_type = 'CHAR';
 
@@ -619 +617 @@
 
             if ( in_array( $meta_compare, array( 'IN', 'BETWEEN' ) ) ) {
-                if ( !is_array( $meta_value ) )
+                if ( ! is_array( $meta_value ) )
                     $meta_value = preg_split( '/[,\s]+/', $meta_value );
             } else {