Ticket #38349: 38349.diff

src/wp-admin/network/site-info.php

@@ -37 +37 @@
         wp_die( __('Invalid site ID.') );
 }
 
-$details = get_blog_details( $id );
+$details = get_site( $id );
 if ( ! $details ) {
         wp_die( __( 'The requested site does not exist.' ) );
 }
@@ -84 +84 @@
                 $blog_data['path'] = $update_parsed_url['path'];
         }
 
-        $existing_details = get_blog_details( $id, false );
+        $existing_details = get_site( $id );
         $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
         foreach ( $blog_data_checkboxes as $c ) {
                 if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
@@ -97 +97 @@
         update_blog_details( $id, $blog_data );
 
         // Maybe update home and siteurl options.
-        $new_details = get_blog_details( $id, false );
+        $new_details = get_site( $id );
 
         $old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
         $old_home_parsed = parse_url( $old_home_url );

src/wp-admin/network/site-settings.php

@@ -35 +35 @@
 if ( ! $id )
         wp_die( __('Invalid site ID.') );
 
-$details = get_blog_details( $id );
+$details = get_site( $id );
 if ( ! $details ) {
         wp_die( __( 'The requested site does not exist.' ) );
 }

src/wp-admin/network/site-themes.php

@@ -58 +58 @@
 
 $wp_list_table->prepare_items();
 
-$details = get_blog_details( $id );
+$details = get_site( $id );
 if ( ! $details ) {
         wp_die( __( 'The requested site does not exist.' ) );
 }

src/wp-admin/network/site-users.php

@@ -51 +51 @@
 if ( ! $id )
         wp_die( __('Invalid site ID.') );
 
-$details = get_blog_details( $id );
+$details = get_site( $id );
 if ( ! $details ) {
         wp_die( __( 'The requested site does not exist.' ) );
 }

src/wp-admin/network/sites.php

@@ -91 +91 @@
                         wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
                 }
 
-                $site_details = get_blog_details( $id );
+                $site_details = get_site( $id );
                 $site_address = untrailingslashit( $site_details->domain . $site_details->path );
 
                 require_once( ABSPATH . 'wp-admin/admin-header.php' );