Changeset 15715 for trunk/wp-includes/user.php

Timestamp:

10/04/2010 06:57:13 PM (16 years ago)

Author:

scribu

Message:

Introduce WP_Object_Query. See #15032

File:

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

trunk/wp-includes/user.php

@@ -331 +331 @@
  * @since 3.1.0
  */
-class WP_User_Query {
+class WP_User_Query extends WP_Object_Query {
 
     /**
@@ -445 +445 @@
         }
 
+        $this->parse_meta_query( $qv );
+
         $role = trim( $qv['role'] );
         $blog_id = absint( $qv['blog_id'] );
-
-        $meta_queries = array();
 
         if ( $blog_id ) {
@@ -459 +459 @@
             }
 
-            $meta_queries[] = $cap_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 ) ) {
-            $meta_queries[] = $meta_query;
-        }
-
-        list( $meta_join, $meta_where ) = _wp_meta_sql( $meta_queries, $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
+            $this->meta_query[] = $cap_meta_query;
+        }
+
+        list( $meta_join, $meta_where ) = $this->get_meta_sql( $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
         $this->query_from .= $meta_join;
         $this->query_where .= $meta_where;