Changeset 16050 for trunk/wp-includes/user.php

Timestamp:

10/28/2010 03:46:11 PM (16 years ago)

Author:

ryan

Message:

get_current_blog_id(). Props aaroncampbell. fixes #15233

File:

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

trunk/wp-includes/user.php

@@ -377 +377 @@
                                 'blog_id' => $GLOBALS['blog_id'],
                                 'role' => '',
-                                'meta_key' => '', 
+                                'meta_key' => '',
                                 'meta_value' => '',
                                 'meta_compare' => '',
@@ -573 +573 @@
  */
 function get_users_of_blog( $id = '' ) {
-        global $blog_id;
-
         if ( empty( $id ) )
-                $id = (int) $blog_id;
+                $id = get_current_blog_id();
 
         return get_users( array( 'blog_id' => $id ) );
@@ -594 +592 @@
 
         if ( !is_multisite() ) {
-                global $blog_id;
+                $blog_id = get_current_blog_id();
                 $blogs = array();
                 $blogs[ $blog_id ]->userblog_id = $blog_id;
@@ -758 +756 @@
  */
 function count_users($strategy = 'time') {
-        global $wpdb, $blog_id, $wp_roles;
+        global $wpdb, $wp_roles;
 
         // Initialize
-        $id = (int) $blog_id;
+        $id = get_current_blog_id();
         $blog_prefix = $wpdb->get_blog_prefix($id);
         $result = array();