IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

call get_users() from get_users_of_blog()

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu
2010-09-05 14:35:55 +00:00
parent 27d0a177f7
commit 11ff3a7ce9
5 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/capabilities.php
View File

@@ -471,9 +471,10 @@ class WP_User {
*
* @param int|string $id User's ID or username
* @param int $name Optional. User's username
* @param int $blog_id Optional Blog ID, defaults to current blog.
* @return WP_User
*/
function WP_User( $id, $name = '' ) {
function WP_User( $id, $name = '', $blog_id = '' ) {
if ( empty( $id ) && empty( $name ) )
return;
@@ -496,7 +497,7 @@ class WP_User {
}
$this->id = $this->ID;
$this->_init_caps();
$this->for_blog( $blog_id );
}
/**

2
wp-includes/functions.php
View File

@@ -4225,6 +4225,8 @@ function _wp_search_sql($string, $cols) {
* @since 3.1.0
*
* @param array $queries An array of queries
* @param string $meta_id_column The column that holds the object id
* @param string $table Which meta table to look in
* @return string
*/
function _wp_meta_sql( $queries, $meta_id_column, $table ) {

37
wp-includes/user.php
View File

@@ -374,11 +374,12 @@ class WP_User_Query {
function __construct( $query = null ) {
if ( !empty( $query ) ) {
$this->query_vars = wp_parse_args( $query, array(
'search' => '', 'role' => '',
'offset' => '', 'number' => '', 'count_total' => true,
'orderby' => 'login', 'order' => 'ASC',
'meta_key' => '', 'meta_value' => '',
'role' => '', 'blog_id' => $GLOBALS['blog_id'],
'meta_key' => '', 'meta_value' => '', 'meta_compare' => '',
'include' => array(), 'exclude' => array(),
'search' => '',
'orderby' => 'login', 'order' => 'ASC',
'offset' => '', 'number' => '', 'count_total' => true,
'fields' => 'all',
) );
@@ -444,22 +445,22 @@ class WP_User_Query {
}
$role = trim( $qv['role'] );
$blog_id = absint( $qv['blog_id'] );
$meta_queries = array();
$cap_meta_query = array();
$cap_meta_key = $wpdb->prefix . 'capabilities';
if ( $blog_id ) {
$cap_meta_query = array();
$cap_meta_query['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
if ( $role || is_multisite() )
$cap_meta_query['meta_key'] = $cap_meta_key;
if ( $role ) {
$cap_meta_query['meta_value'] = $role;
$cap_meta_query['meta_compare'] = 'like';
}
if ( $role ) {
$cap_meta_query['meta_value'] = $role;
$cap_meta_query['meta_compare'] = 'like';
$meta_queries[] = $cap_meta_query;
}
$meta_queries[] = $cap_meta_query;
$meta_queries[] = array(
'meta_key' => @$qv['meta_key'],
'meta_value' => @$qv['meta_key'],
@@ -506,7 +507,7 @@ class WP_User_Query {
$r = array();
foreach ( $this->results as $userid )
$r[ $userid ] = new WP_User( $userid );
$r[ $userid ] = new WP_User( $userid, '', $this->query_vars['blog_id'] );
$this->results = $r;
}
@@ -564,7 +565,7 @@ function get_users( $args ) {
* multi-blog feature.
*
* @since 2.2.0
* @uses $wpdb WordPress database object for queries
* @uses get_users() for queries
* @uses $blog_id The Blog id of the blog for those that use more than one blog
*
* @param int $id Blog ID.
@@ -572,11 +573,11 @@ function get_users( $args ) {
*/
function get_users_of_blog( $id = '' ) {
global $wpdb, $blog_id;
if ( empty($id) )
$id = (int) $blog_id;
$blog_prefix = $wpdb->get_blog_prefix($id);
$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" );
return $users;
return get_users( array( 'blog_id' => $id ) );
}
/**