Changeset 16974

Timestamp:

12/15/2010 11:56:53 PM (14 years ago)

Author:

scribu

Message:

Fetch only the required field in wp_dropdown_users(). See #14572

File:

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

trunk/wp-includes/user.php

@@ -352 +352 @@
     var $total_users = 0;
 
-    // SQL pieces
+    // SQL clauses
+    var $query_fields;
     var $query_from;
     var $query_where;
@@ -407 +408 @@
         $qv = &$this->query_vars;
 
-        $this->query_from = " FROM $wpdb->users";
-        $this->query_where = " WHERE 1=1";
+        if ( is_array( $qv['fields'] ) ) {
+            $qv['fields'] = array_unique( $qv['fields'] );
+
+            $this->query_fields = array();
+            foreach ( $qv['fields'] as $field )
+                $this->query_fields[] = $wpdb->users . '.' . esc_sql( $field );
+            $this->query_fields = implode( ',', $this->query_fields );
+        } else {
+            $this->query_fields = "$wpdb->users.ID";
+        }
+
+        $this->query_from = "FROM $wpdb->users";
+        $this->query_where = "WHERE 1=1";
 
         // sorting
@@ -438 +450 @@
         else
             $order = 'DESC';
-        $this->query_orderby = " ORDER BY $orderby $order";
+        $this->query_orderby = "ORDER BY $orderby $order";
 
         // limit
         if ( $qv['number'] ) {
             if ( $qv['offset'] )
-                $this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $qv['offset'], $qv['number']);
+                $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
             else
-                $this->query_limit = $wpdb->prepare(" LIMIT %d", $qv['number']);
+                $this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']);
         }
 
@@ -511 +523 @@
         global $wpdb;
 
-        $this->results = $wpdb->get_col("SELECT $wpdb->users.ID" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+        if ( is_array( $this->query_vars['fields'] ) ) {
+            $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
+        } else {
+            $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
+        }
 
         if ( !$this->results )
@@ -517 +533 @@
 
         if ( $this->query_vars['count_total'] )
-            $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID)" . $this->query_from . $this->query_where);
+            $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID) $this->query_from $this->query_where $this->query_orderby $this->query_limit");
 
         if ( 'all' == $this->query_vars['fields'] ) {
@@ -968 +984 @@
     extract( $r, EXTR_SKIP );
 
-    $users = get_users( wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
+    $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) );
+    $query_args['fields'] = array( 'ID', $show );
+
+    $users = get_users( $query_args );
 
     $output = '';