Changeset 13123

Timestamp:

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

Author:

nacin

Message:

s/$blog/$blog_id/ as an argument in wp_dropdown_users(), for consistency, see #11086

File:

• trunk/wp-includes/user.php (modified) (4 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>
+ * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
  * </ol>
  *
@@ -518 +518 @@
  */
 function wp_dropdown_users( $args = '' ) {
-    global $wpdb, $blog_id;
+    global $wpdb;
     $defaults = array(
         'show_option_all' => '', 'show_option_none' => '',
@@ -524 +524 @@
         'include' => '', 'exclude' => '', 'multi' => 0,
         'show' => 'display_name', 'echo' => 1,
-        'selected' => 0, 'name' => 'user', 'class' => '', 'blog' => $blog_id,
+        'selected' => 0, 'name' => 'user', 'class' => '', 'blog_id' => $GLOBALS['blog_id'],
     );
 
@@ -532 +532 @@
     extract( $r, EXTR_SKIP );
 
-    $blog_prefix = $wpdb->get_blog_prefix( $blog );
+    $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
     $query = "SELECT {$wpdb->users}.* FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities'";