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

Timestamp:

10/02/2017 01:43:48 AM (7 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-blogs.php (modified) (2 diffs)

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

@@ -13 +13 @@
  *
  * @since MU (3.0.0)
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wpmu_update_blogs_date() {
-    global $wpdb;
-
-    update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+    $site_id = get_current_blog_id();
+
+    update_blog_details( $site_id, array( 'last_updated' => current_time( 'mysql', true ) ) );
     /**
      * Fires after the blog details are updated.
@@ -27 +25 @@
      * @param int $blog_id Site ID.
      */
-    do_action( 'wpmu_blog_updated', $wpdb->blogid );
+    do_action( 'wpmu_blog_updated', $site_id );
 }