Changeset 41661

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.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-admin/ms-delete-site.php (modified) (1 diff)
• src/wp-admin/user-new.php (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (2 diffs)
• src/wp-includes/ms-default-constants.php (modified) (2 diffs)
• src/wp-includes/ms-functions.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/site.php (modified) (1 diff)
• tests/phpunit/tests/user/multisite.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -434 +434 @@
 
     if ( is_multisite() ) {
-        if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-            $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-        else
-            $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+        $site_id = get_current_blog_id();
+
+        if ( $wpdb->get_row( $wpdb->prepare( 'SELECT blog_id FROM %s WHERE blog_id = %d', $wpdb->blog_versions, $site_id ) ) ) {
+            $wpdb->query( $wpdb->prepare( 'UPDATE %s SET db_version = %d WHERE blog_id = %d', $wpdb->blog_versions, $wp_db_version, $site_id ) );
+        } else {
+            $wpdb->query( $wpdb->prepare( 'INSERT INTO %s ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, %s);', $wpdb->blog_versions, $site_id, $wp_db_version, NOW() ) );
+        }
     }
 
@@ -1258 +1261 @@
             $start += 20;
         }
-        refresh_blog_details( $wpdb->blogid );
+        refresh_blog_details();
     }
 }

trunk/src/wp-admin/ms-delete-site.php

@@ -18 +18 @@
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
     if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
-        wpmu_delete_blog( $wpdb->blogid );
+        wpmu_delete_blog( get_current_blog_id() );
         wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), get_network()->site_name ) );
     } else {

trunk/src/wp-admin/user-new.php

@@ -157 +157 @@
                 add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
             }
-            wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
+            wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => get_current_blog_id(), 'new_role' => $_REQUEST['role'] ) );
             if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
                 $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );

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 );
 }
 

trunk/src/wp-includes/ms-default-constants.php

@@ -15 +15 @@
  *
  * @since 3.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function ms_upload_constants() {
-    global $wpdb;
-
     // This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
     add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
@@ -34 +30 @@
     // This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
     if ( ! defined( 'UPLOADS' ) ) {
-        define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+        $site_id = get_current_blog_id();
+
+        define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' );
 
         // Uploads dir relative to ABSPATH
         if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-            define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+            define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );
     }
 }

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;

trunk/tests/phpunit/tests/multisite/site.php

@@ -364 +364 @@
 
         // compare the update time with the current time, allow delta < 2
-        $blog = get_site( $wpdb->blogid );
+        $blog = get_site( get_current_blog_id() );
         $current_time = time();
         $time_difference = $current_time - strtotime( $blog->last_updated );

trunk/tests/phpunit/tests/user/multisite.php

@@ -121 +121 @@
 
         $this->assertTrue( is_blog_user() );
-        $this->assertTrue( is_blog_user( $wpdb->blogid ) );
+        $this->assertTrue( is_blog_user( get_current_blog_id() ) );
 
         $blog_ids = array();
@@ -150 +150 @@
 
         wp_set_current_user( $user1_id );
+        $site_id = get_current_blog_id();
 
         $this->assertTrue( is_user_member_of_blog() );
         $this->assertTrue( is_user_member_of_blog( 0, 0 ) );
-        $this->assertTrue( is_user_member_of_blog( 0, $wpdb->blogid ) );
+        $this->assertTrue( is_user_member_of_blog( 0, $site_id ) );
         $this->assertTrue( is_user_member_of_blog( $user1_id ) );
-        $this->assertTrue( is_user_member_of_blog( $user1_id, $wpdb->blogid ) );
+        $this->assertTrue( is_user_member_of_blog( $user1_id, $site_id ) );
 
         $blog_ids = self::factory()->blog->create_many( 1 );