Changeset 41661 for trunk/src/wp-admin/includes/upgrade.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-admin/includes/upgrade.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();
     }
 }