Changeset 41661 for trunk/src/wp-admin/ms-delete-site.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/ms-delete-site.php (modified) (1 diff)

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 {