Changeset 41661 for trunk/src/wp-includes/ms-functions.php

Timestamp:

10/02/2017 01:43:48 AM (9 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_current_blog_id() instead of $wpdb->blogid.

get_current_blog_id() is more appropriate for determining the ID of the current site in most cases. This eliminates the need for the global $wpdb in several functions and is better than the implicit global used in admin pages.

Props bnap00, spacedmonkey.
Fixes #41684.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (2 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -35 +35 @@
  * @since MU (3.0.0) 1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $user_id The unique ID of the user
  * @return WP_Site|void The blog object
  */
 function get_active_blog_for_user( $user_id ) {
-        global $wpdb;
         $blogs = get_blogs_of_user( $user_id );
         if ( empty( $blogs ) )
                 return;
 
-        if ( !is_multisite() )
-                return $blogs[$wpdb->blogid];
+        if ( ! is_multisite() ) {
+                return $blogs[ get_current_blog_id() ];
+        }
 
         $primary_blog = get_user_meta( $user_id, 'primary_blog', true );
@@ -2220 +2218 @@
         $current_user = wp_get_current_user();
         if ( $blog_id == 0 ) {
-                $blog_id = $wpdb->blogid;
+                $blog_id = get_current_blog_id();
         }
         $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;