Changeset 13122

Timestamp:

02/13/2010 08:12:08 PM (16 years ago)

Author:

nacin

Message:

Don't query against entire users table in wp_dropdown_users() to be multisite friendly. Fixes #11086

File:

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

trunk/wp-includes/user.php

@@ -508 +508 @@
  * <li>name - Default is 'user'. Name attribute of select element.</li>
  * <li>class - Class attribute of select element.</li>
+ * <li>blog - ID of blog (Multisite only). Defaults to ID of current blog.</li>
  * </ol>
  *
@@ -517 +518 @@
  */
 function wp_dropdown_users( $args = '' ) {
-    global $wpdb;
+    global $wpdb, $blog_id;
     $defaults = array(
         'show_option_all' => '', 'show_option_none' => '',
@@ -523 +524 @@
         'include' => '', 'exclude' => '', 'multi' => 0,
         'show' => 'display_name', 'echo' => 1,
-        'selected' => 0, 'name' => 'user', 'class' => ''
+        'selected' => 0, 'name' => 'user', 'class' => '', 'blog' => $blog_id,
     );
 
@@ -531 +532 @@
     extract( $r, EXTR_SKIP );
 
-    $query = "SELECT * FROM $wpdb->users";
+    $blog_prefix = $wpdb->get_blog_prefix( $blog );
+    $query = "SELECT {$wpdb->users}.* FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities'";
 
     $query_where = array();
@@ -548 +550 @@
 
     if ( $query_where )
-        $query .= " WHERE " . join(' AND', $query_where);
+        $query .= " AND " . join(' AND', $query_where);
 
     $query .= " ORDER BY $orderby $order";