Changeset 15566 for trunk/wp-includes/user.php
- Timestamp:
- 09/05/2010 02:35:55 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/user.php
r15565 r15566 375 375 if ( !empty( $query ) ) { 376 376 $this->query_vars = wp_parse_args( $query, array( 377 'search' => '', 'role' => '', 377 'role' => '', 'blog_id' => $GLOBALS['blog_id'], 378 'meta_key' => '', 'meta_value' => '', 'meta_compare' => '', 379 'include' => array(), 'exclude' => array(), 380 'search' => '', 381 'orderby' => 'login', 'order' => 'ASC', 378 382 'offset' => '', 'number' => '', 'count_total' => true, 379 'orderby' => 'login', 'order' => 'ASC',380 'meta_key' => '', 'meta_value' => '',381 'include' => array(), 'exclude' => array(),382 383 'fields' => 'all', 383 384 ) ); … … 445 446 446 447 $role = trim( $qv['role'] ); 448 $blog_id = absint( $qv['blog_id'] ); 447 449 448 450 $meta_queries = array(); 449 451 450 $cap_meta_query = array(); 451 $cap_meta_key = $wpdb->prefix . 'capabilities'; 452 453 if ( $role || is_multisite() ) 454 $cap_meta_query['meta_key'] = $cap_meta_key; 455 456 if ( $role ) { 457 $cap_meta_query['meta_value'] = $role; 458 $cap_meta_query['meta_compare'] = 'like'; 459 } 460 461 $meta_queries[] = $cap_meta_query; 452 if ( $blog_id ) { 453 $cap_meta_query = array(); 454 $cap_meta_query['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities'; 455 456 if ( $role ) { 457 $cap_meta_query['meta_value'] = $role; 458 $cap_meta_query['meta_compare'] = 'like'; 459 } 460 461 $meta_queries[] = $cap_meta_query; 462 } 462 463 463 464 $meta_queries[] = array( … … 507 508 $r = array(); 508 509 foreach ( $this->results as $userid ) 509 $r[ $userid ] = new WP_User( $userid );510 $r[ $userid ] = new WP_User( $userid, '', $this->query_vars['blog_id'] ); 510 511 511 512 $this->results = $r; … … 565 566 * 566 567 * @since 2.2.0 567 * @uses $wpdb WordPress database objectfor queries568 * @uses get_users() for queries 568 569 * @uses $blog_id The Blog id of the blog for those that use more than one blog 569 570 * … … 573 574 function get_users_of_blog( $id = '' ) { 574 575 global $wpdb, $blog_id; 576 575 577 if ( empty($id) ) 576 578 $id = (int) $blog_id; 577 $blog_prefix = $wpdb->get_blog_prefix($id); 578 $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" ); 579 return $users; 579 580 return get_users( array( 'blog_id' => $id ) ); 580 581 } 581 582
Note: See TracChangeset
for help on using the changeset viewer.