diff --git a/wp-includes/user.php b/wp-includes/user.php index 02f2abcba..04696ca9a 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -507,7 +507,7 @@ function setup_userdata($for_user_id = '') { *
  • selected - Which User ID is selected.
  • *
  • name - Default is 'user'. Name attribute of select element.
  • *
  • class - Class attribute of select element.
  • - *
  • blog - ID of blog (Multisite only). Defaults to ID of current blog.
  • + *
  • blog_id - ID of blog (Multisite only). Defaults to ID of current blog.
  • * * * @since 2.3.0 @@ -517,13 +517,13 @@ function setup_userdata($for_user_id = '') { * @return string|null Null on display. String of HTML content on retrieve. */ function wp_dropdown_users( $args = '' ) { - global $wpdb, $blog_id; + global $wpdb; $defaults = array( 'show_option_all' => '', 'show_option_none' => '', 'orderby' => 'display_name', 'order' => 'ASC', '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'], ); $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0; @@ -531,7 +531,7 @@ function wp_dropdown_users( $args = '' ) { $r = wp_parse_args( $args, $defaults ); 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'"; $query_where = array();