Changeset 15714

Timestamp:

10/04/2010 06:26:26 PM (14 years ago)

Author:

scribu

Message:

Strip redundant 'meta_' from 'meta_query' keys. See #14645

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• query.php (modified) (1 diff)
• user.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -4279 +4279 @@
     $i = 0;
     foreach ( $queries as $q ) {
-        $meta_key = isset( $q['meta_key'] ) ? trim( $q['meta_key'] ) : '';
-        $meta_value = isset( $q['meta_value'] ) ? trim( $q['meta_value'] ) : '';
-        $meta_compare = isset( $q['meta_compare'] ) ? $q['meta_compare'] : '=';
+        $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
+        $meta_value = isset( $q['value'] ) ? trim( $q['value'] ) : '';
+        $meta_compare = isset( $q['compare'] ) ? $q['compare'] : '=';
 
         if ( !in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'like' ) ) )

trunk/wp-includes/query.php

@@ -1394 +1394 @@
             }
 
-            $meta_query = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
-
-            if ( !empty( $meta_query ) )
+            $meta_query = array();
+            foreach ( array( 'key', 'value', 'compare' ) as $key ) {
+                if ( !empty( $qv[ "meta_$key" ] ) )
+                    $meta_query[ $key ] = $qv[ "meta_$key" ];
+            }
+
+            if ( !empty( $meta_query ) ) {
                 $this->meta_query[] = $meta_query;
+            }
 
             if ( empty($qv['author']) || ($qv['author'] == '0') ) {

trunk/wp-includes/user.php

@@ -452 +452 @@
         if ( $blog_id ) {
             $cap_meta_query = array();
-            $cap_meta_query['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+            $cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
 
             if ( $role ) {
-                $cap_meta_query['meta_value'] = $role;
-                $cap_meta_query['meta_compare'] = 'like';
+                $cap_meta_query['value'] = $role;
+                $cap_meta_query['compare'] = 'like';
             }
 
@@ -462 +462 @@
         }
 
-        $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
+        $meta_query = array();
+        foreach ( array( 'key', 'value', 'compare' ) as $key ) {
+            if ( !empty( $qv[ "meta_$key" ] ) )
+                $meta_query[ $key ] = $qv[ "meta_$key" ];
+        }
+
+        if ( !empty( $meta_query ) ) {
+            $meta_queries[] = $meta_query;
+        }
 
         list( $meta_join, $meta_where ) = _wp_meta_sql( $meta_queries, $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );