Ticket #37102: 37102.patch

src/wp-admin/includes/ms.php

@@ -66 +66 @@
                 switch_to_blog( $blog_id );
         }
 
-        $blog = get_blog_details( $blog_id );
+        $blog = get_site( $blog_id );
         /**
          * Fires before a site is deleted.
          *

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

@@ -24 +24 @@
         }
 }
 
-$blog = get_blog_details();
+$blog = get_site();
 $user = wp_get_current_user();
 
 $title = __( 'Delete Site' );

src/wp-admin/my-sites.php

@@ -23 +23 @@
 if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
         check_admin_referer( 'update-my-sites' );
 
-        $blog = get_blog_details( (int) $_POST['primary_blog'] );
+        $blog = get_site( (int) $_POST['primary_blog'] );
         if ( $blog && isset( $blog->domain ) ) {
                 update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
                 $updated = true;

src/wp-includes/class-wp-xmlrpc-server.php

@@ -4360 +4360 @@
          * @return array|IXR_Error
          */
         protected function _multisite_getUsersBlogs( $args ) {
-                $current_blog = get_blog_details();
+                $current_blog = get_site();
 
                 $domain = $current_blog->domain;
                 $path = $current_blog->path . 'xmlrpc.php';

src/wp-includes/ms-blogs.php

@@ -38 +38 @@
  * @return string Full URL of the blog if found. Empty string if not.
  */
 function get_blogaddress_by_id( $blog_id ) {
-        $bloginfo = get_blog_details( (int) $blog_id );
+        $bloginfo = get_site( (int) $blog_id );
 
         if ( empty( $bloginfo ) ) {
                 return '';
         }
 
-        $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
+        $scheme = parse_url( get_blog_option( $blog, 'home' ), PHP_URL_SCHEME );
         $scheme = empty( $scheme ) ? 'http' : $scheme;
 
         return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
@@ -264 +264 @@
                 $blog_id = get_current_blog_id();
         }
 
-        $details = get_blog_details( $blog_id, false );
+        $details = get_site( $blog_id );
         if ( ! $details ) {
                 // Make sure clean_blog_cache() gets the blog ID
                 // when the blog has been previously cached as
@@ -1035 +1035 @@
 function get_blog_status( $id, $pref ) {
         global $wpdb;
 
-        $details = get_blog_details( $id, false );
+        $details = get_site( $id );
         if ( $details )
                 return $details->$pref;
 

src/wp-includes/ms-deprecated.php

@@ -19 +19 @@
  *
  * @since MU
  * @deprecated 3.1.0 Use get_blog_details()
- * @see get_blog_details()
+ * @deprecated 4.6.0 Use get_site()
+ * @see get_site()
  *
  * @return int Current site ID.
  */
@@ -26 +27 @@
 function get_dashboard_blog() {
     _deprecated_function( __FUNCTION__, '3.1' );
     if ( $blog = get_site_option( 'dashboard_blog' ) )
-        return get_blog_details( $blog );
+        return get_site( $blog );
 
-    return get_blog_details( $GLOBALS['current_site']->blog_id );
+    return get_site( $GLOBALS['current_site']->blog_id );
 }
 
 /**

src/wp-includes/ms-functions.php

@@ -53 +53 @@
         if ( false !== $primary_blog ) {
                 if ( ! isset( $blogs[ $primary_blog ] ) ) {
                         update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-                        $primary = get_blog_details( $first_blog->userblog_id );
+                        $primary = get_site( $first_blog->userblog_id );
                 } else {
-                        $primary = get_blog_details( $primary_blog );
+                        $primary = get_site( $primary_blog );
                 }
         } else {
                 //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
@@ -71 +71 @@
                         foreach ( (array) $blogs as $blog_id => $blog ) {
                                 if ( $blog->site_id != $wpdb->siteid )
                                         continue;
-                                $details = get_blog_details( $blog_id );
+                                $details = get_site( $blog_id );
                                 if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
                                         $ret = $blog;
                                         if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
@@ -161 +161 @@
 
         if ( !get_user_meta($user_id, 'primary_blog', true) ) {
                 update_user_meta($user_id, 'primary_blog', $blog_id);
-                $details = get_blog_details($blog_id);
+                $details = get_site( $blog_id );
                 update_user_meta($user_id, 'source_domain', $details->domain);
         }
 

src/wp-includes/ms-load.php

@@ -68 +68 @@
  * @return true|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
-        $blog = get_blog_details();
+        $blog = get_site();
 
         /**
          * Filters checking the status of the current blog.

src/wp-includes/user.php

@@ -719 +719 @@
                 $blog_id = get_current_blog_id();
         }
 
-        $blog = get_blog_details( $blog_id );
+        $blog = get_site( $blog_id );
 
         if ( ! $blog || ! isset( $blog->domain ) || $blog->archived || $blog->spam || $blog->deleted ) {
                 return false;