Changeset 38814

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

Location:

trunk/src

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/ms-delete-site.php (modified) (3 diffs)
• wp-admin/network/settings.php (modified) (1 diff)
• wp-admin/network/site-new.php (modified) (4 diffs)
• wp-admin/network/sites.php (modified) (3 diffs)
• wp-admin/network/users.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/functions.php (modified) (5 diffs)
• wp-includes/http.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (3 diffs)
• wp-includes/load.php (modified) (2 diffs)
• wp-includes/ms-blogs.php (modified) (1 diff)
• wp-includes/ms-default-constants.php (modified) (4 diffs)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (18 diffs)
• wp-includes/ms-load.php (modified) (1 diff)
• wp-includes/option.php (modified) (12 diffs)
• wp-login.php (modified) (2 diffs)
• wp-signup.php (modified) (4 diffs)

trunk/src/wp-admin/admin-header.php

@@ -34 +34 @@
 
 if ( is_network_admin() )
-    $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
+    $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
 elseif ( is_user_admin() )
-    $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
+    $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
 else
     $admin_title = get_bloginfo( 'name' );

trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -519 +519 @@
         $actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
         $actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-        if ( get_current_site()->blog_id != $blog['blog_id'] ) {
+        if ( get_network()->site_id != $blog['blog_id'] ) {
             if ( $blog['deleted'] == '1' ) {
                 $actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -330 +330 @@
             $path   = ( $val->path === '/' ) ? '' : $val->path;
             echo '<span class="site-' . $val->site_id . '" >';
-            echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
+            echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_network()->domain, '', $val->domain . $path ) . '</a>';
             echo ' <small class="row-actions">';
             $actions = array();

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

@@ -89 +89 @@
     update_blog_status( $blog_id, 'deleted', 1 );
 
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     // If a full blog object is not available, do not destroy anything.
@@ -97 +97 @@
 
     // Don't destroy the initial, main, or root blog.
-    if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
+    if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) {
         $drop = false;
     }

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

@@ -528 +528 @@
     if ( is_multisite() ) {
         /* translators: site tagline */
-        $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
+        $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_network()->site_name );
         $options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
     }

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

@@ -162 +162 @@
 
         $first_post = sprintf( $first_post,
-            sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->site_name )
+            sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
         );
 
         // Back-compat for pre-4.4
         $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
-        $first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post );
+        $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
     } else {
         $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );

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

@@ -19 +19 @@
     if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
         wpmu_delete_blog( $wpdb->blogid );
-        wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
+        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 {
         wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) );
@@ -71 +71 @@
     $content = str_replace( '###USERNAME###', $user->user_login, $content );
     $content = str_replace( '###URL_DELETE###', $url_delete, $content );
-    $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+    $content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
 
     wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
@@ -80 +80 @@
 <?php } else {
     ?>
-    <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
+    <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), get_network()->site_name); ?></p>
     <p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
 

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

@@ -105 +105 @@
                 <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
                 <td>
-                    <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
+                    <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ) ?>" />
                 </td>
             </tr>

trunk/src/wp-admin/network/site-new.php

@@ -87 +87 @@
 
     if ( is_subdomain_install() ) {
-        $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
-        $path      = $current_site->path;
+        $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
+        $path      = get_network()->path;
     } else {
-        $newdomain = $current_site->domain;
-        $path      = $current_site->path . $domain . '/';
+        $newdomain = get_network()->domain;
+        $path      = get_network()->path . $domain . '/';
     }
 
@@ -127 +127 @@
 
     $wpdb->hide_errors();
-    $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, $current_site->id );
+    $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
     $wpdb->show_errors();
     if ( ! is_wp_error( $id ) ) {
@@ -139 +139 @@
                 /* translators: %s: network name */
                 __( '[%s] New Site Created' ),
-                $current_site->site_name
+                get_network()->site_name
             ),
             sprintf(
@@ -199 +199 @@
             <td>
             <?php if ( is_subdomain_install() ) { ?>
-                <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+                <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
             <?php } else {
-                echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
+                echo get_network()->domain . get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
             <?php }
             echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';

trunk/src/wp-admin/network/sites.php

@@ -88 +88 @@
         }
 
-        if ( $current_site->blog_id == $id ) {
+        if ( get_network()->site_id == $id ) {
             wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
         }
@@ -127 +127 @@
 
             $updated_action = 'not_deleted';
-            if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
+            if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
                 wpmu_delete_blog( $id, true );
                 $updated_action = 'delete';
@@ -138 +138 @@
 
                 foreach ( (array) $_POST['allblogs'] as $key => $val ) {
-                    if ( $val != '0' && $val != $current_site->blog_id ) {
+                    if ( $val != '0' && $val != get_network()->site_id ) {
                         switch ( $doaction ) {
                             case 'delete':

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

@@ -73 +73 @@
                                 $blogs = get_blogs_of_user( $user_id, true );
                                 foreach ( (array) $blogs as $details ) {
-                                    if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
+                                    if ( $details->userblog_id != get_network()->site_id ) // main blog not a spam !
                                         update_blog_status( $details->userblog_id, 'spam', '1' );
                                 }

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

@@ -313 +313 @@
     if ( is_network_admin() ) {
         /* translators: %s: site name */
-        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
+        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
     } elseif ( is_user_admin() ) {
         /* translators: %s: site name */
-        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
+        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
     }
 

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

@@ -629 +629 @@
         foreach ( $blogs as $blog ) {
             // Don't include blogs that aren't hosted at this site.
-            if ( $blog->site_id != get_current_site()->id )
+            if ( $blog->site_id != get_current_network_id() )
                 continue;
 

trunk/src/wp-includes/functions.php

@@ -4303 +4303 @@
  * @since 3.0.0
  *
- * @global object $current_site
- *
  * @param int $site_id Optional. Site ID to test. Defaults to current site.
  * @return bool True if $site_id is the main site of the network, or if not
@@ -4310 +4308 @@
  */
 function is_main_site( $site_id = null ) {
-    // This is the current network's information; 'site' is old terminology.
-    global $current_site;
-
     if ( ! is_multisite() )
         return true;
@@ -4319 +4314 @@
         $site_id = get_current_blog_id();
 
-    return (int) $site_id === (int) $current_site->blog_id;
+    return (int) $site_id === (int) get_network()->site_id;
 }
 
@@ -4335 +4330 @@
     }
 
-    $current_network_id = (int) get_current_site()->id;
-
     if ( null === $network_id ) {
-        $network_id = $current_network_id;
+        $network_id = get_current_network_id();
     }
 
@@ -4358 +4351 @@
     }
 
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
         $main_network_id = PRIMARY_NETWORK_ID;
-    } elseif ( isset( $current_site->id ) && 1 === (int) $current_site->id ) {
+    } elseif ( isset( $current_network->id ) && 1 === (int) $current_network->id ) {
         // If the current network has an ID of 1, assume it is the main network.
         $main_network_id = 1;

trunk/src/wp-includes/http.php

@@ -618 +618 @@
     if ( $is_external )
         return $is_external;
-    if ( $host === get_current_site()->domain )
+    if ( $host === get_network()->domain )
         return true;
     if ( isset( $queried[ $host ] ) )

trunk/src/wp-includes/link-template.php

@@ -3256 +3256 @@
         return site_url($path, $scheme);
 
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     if ( 'relative' == $scheme )
-        $url = $current_site->path;
+        $url = $current_network->path;
     else
-        $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+        $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
 
     if ( $path && is_string( $path ) )
@@ -3298 +3298 @@
         return home_url($path, $scheme);
 
-    $current_site = get_current_site();
+    $current_network = get_network();
     $orig_scheme = $scheme;
 
@@ -3305 +3305 @@
 
     if ( 'relative' == $scheme )
-        $url = $current_site->path;
+        $url = $current_network->path;
     else
-        $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+        $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
 
     if ( $path && is_string( $path ) )

trunk/src/wp-includes/load.php

@@ -815 +815 @@
  * @since 4.6.0
  *
- * @global WP_Network $current_site The current network.
- *
  * @return int The ID of the current network.
  */
@@ -824 +822 @@
     }
 
-    $current_site = get_current_site();
-
-    if ( ! isset( $current_site->id ) ) {
+    $current_network = get_network();
+
+    if ( ! isset( $current_network->id ) ) {
         return get_main_network_id();
     }
 
-    return absint( $current_site->id );
+    return absint( $current_network->id );
 }
 

trunk/src/wp-includes/ms-blogs.php

@@ -82 +82 @@
  */
 function get_id_from_blogname( $slug ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
     $slug = trim( $slug, '/' );
 
     if ( is_subdomain_install() ) {
-        $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
-        $path = $current_site->path;
+        $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
+        $path = $current_network->path;
     } else {
-        $domain = $current_site->domain;
-        $path = $current_site->path . $slug . '/';
+        $domain = $current_network->domain;
+        $path = $current_network->path . $slug . '/';
     }
 

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

@@ -48 +48 @@
  */
 function ms_cookie_constants(  ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     /**
@@ -54 +54 @@
      */
     if ( !defined( 'COOKIEPATH' ) )
-        define( 'COOKIEPATH', $current_site->path );
+        define( 'COOKIEPATH', $current_network->path );
 
     /**
@@ -60 +60 @@
      */
     if ( !defined( 'SITECOOKIEPATH' ) )
-        define( 'SITECOOKIEPATH', $current_site->path );
+        define( 'SITECOOKIEPATH', $current_network->path );
 
     /**
@@ -77 +77 @@
      */
     if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-        if ( !empty( $current_site->cookie_domain ) )
-            define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+        if ( !empty( $current_network->cookie_domain ) )
+            define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
         else
-            define('COOKIE_DOMAIN', '.' . $current_site->domain);
+            define('COOKIE_DOMAIN', '.' . $current_network->domain);
     }
 }

trunk/src/wp-includes/ms-deprecated.php

@@ -29 +29 @@
         return get_blog_details( $blog );
 
-    return get_blog_details( get_current_site()->blog_id );
+    return get_blog_details( get_network()->site_id );
 }
 

trunk/src/wp-includes/ms-functions.php

@@ -547 +547 @@
     global $wpdb, $domain;
 
-    $current_site = get_current_site();
-    $base = $current_site->path;
+    $current_network = get_network();
+    $base = $current_network->path;
 
     $blog_title = strip_tags( $blog_title );
@@ -581 +581 @@
 
     // do not allow users to create a blog that conflicts with a page on the main blog.
-    if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
+    if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
         $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
 
@@ -613 +613 @@
         $path = $base.$blogname.'/';
     }
-    if ( domain_exists($mydomain, $path, $current_site->id) )
+    if ( domain_exists($mydomain, $path, $current_network->id) )
         $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
 
@@ -790 +790 @@
 
     // Send email with activation link.
-    if ( !is_subdomain_install() || get_current_site()->id != 1 )
+    if ( !is_subdomain_install() || get_current_network_id() != 1 )
         $activate_url = network_site_url("wp-activate.php?key=$key");
     else
@@ -1335 +1335 @@
  */
 function install_blog( $blog_id, $blog_title = '' ) {
-    global $wpdb, $wp_roles, $current_site;
+    global $wpdb, $wp_roles;
 
     // Cast for security
@@ -1364 +1364 @@
             $siteurl = set_url_scheme( $siteurl, 'https' );
         }
-        if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) {
+        if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) {
             $home = set_url_scheme( $home, 'https' );
         }
@@ -1376 +1376 @@
         update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
     else
-        update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+        update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
 
     update_option( 'blogname', wp_unslash( $blog_title ) );
@@ -1431 +1431 @@
  */
 function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     /**
@@ -1471 +1471 @@
     $user = get_userdata( $user_id );
 
-    $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
+    $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
     $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
     $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
@@ -1501 +1501 @@
     $message = $welcome_email;
 
-    if ( empty( $current_site->site_name ) )
-        $current_site->site_name = 'WordPress';
+    if ( empty( $current_network->site_name ) )
+        $current_network->site_name = 'WordPress';
 
     /**
@@ -1511 +1511 @@
      * @param string $subject Subject of the email.
      */
-    $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
+    $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_network->site_name, wp_unslash( $title ) ) );
     wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
@@ -1532 +1532 @@
  */
 function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     /**
@@ -1565 +1565 @@
      */
     $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
-    $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
+    $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
     $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
     $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
@@ -1579 +1579 @@
     $message = $welcome_email;
 
-    if ( empty( $current_site->site_name ) )
-        $current_site->site_name = 'WordPress';
+    if ( empty( $current_network->site_name ) )
+        $current_network->site_name = 'WordPress';
 
     /**
@@ -1589 +1589 @@
      * @param string $subject Subject of the email.
      */
-    $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
+    $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_network->site_name, $user->user_login) );
     wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
@@ -1878 +1878 @@
  */
 function redirect_this_site( $deprecated = '' ) {
-    return array( get_current_site()->domain );
+    return array( get_network()->domain );
 }
 
@@ -2025 +2025 @@
         $blog_id = $meta[ 'add_to_blog' ];
         $role = $meta[ 'new_role' ];
-        remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
+        remove_user_from_blog($user_id, get_network()->site_id); // remove user from main blog.
         add_user_to_blog( $blog_id, $user_id, $role );
         update_user_meta( $user_id, 'primary_blog', $blog_id );
@@ -2039 +2039 @@
  */
 function fix_phpmailer_messageid( $phpmailer ) {
-    $phpmailer->Hostname = get_current_site()->domain;
+    $phpmailer->Hostname = get_network()->domain;
 }
 

trunk/src/wp-includes/ms-load.php

@@ -98 +98 @@
             return WP_CONTENT_DIR . '/blog-inactive.php';
         } else {
-            $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
+            $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
             wp_die(
                 /* translators: %s: admin email link */

trunk/src/wp-includes/option.php

@@ -1070 +1070 @@
  * @see get_option()
  *
- * @global wpdb   $wpdb
- * @global object $current_site
+ * @global wpdb $wpdb
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
@@ -1079 +1078 @@
  */
 function get_network_option( $network_id, $option, $default = false ) {
-    global $wpdb, $current_site;
+    global $wpdb;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1088 +1087 @@
 
     // Fallback to the current network if a network ID is not specified.
-    if ( ! $network_id && is_multisite() ) {
-        $network_id = $current_site->id;
+    if ( ! $network_id ) {
+        $network_id = get_current_network_id();
     }
 
@@ -1187 +1186 @@
  * @see add_option()
  *
- * @global wpdb   $wpdb
- * @global object $current_site
+ * @global wpdb $wpdb
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
@@ -1196 +1194 @@
  */
 function add_network_option( $network_id, $option, $value ) {
-    global $wpdb, $current_site;
+    global $wpdb;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1205 +1203 @@
 
     // Fallback to the current network if a network ID is not specified.
-    if ( ! $network_id && is_multisite() ) {
-        $network_id = $current_site->id;
+    if ( ! $network_id ) {
+        $network_id = get_current_network_id();
     }
 
@@ -1297 +1295 @@
  * @see delete_option()
  *
- * @global wpdb   $wpdb
- * @global object $current_site
+ * @global wpdb $wpdb
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
@@ -1305 +1302 @@
  */
 function delete_network_option( $network_id, $option ) {
-    global $wpdb, $current_site;
+    global $wpdb;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1314 +1311 @@
 
     // Fallback to the current network if a network ID is not specified.
-    if ( ! $network_id && is_multisite() ) {
-        $network_id = $current_site->id;
+    if ( ! $network_id ) {
+        $network_id = get_current_network_id();
     }
 
@@ -1379 +1376 @@
  * @see update_option()
  *
- * @global wpdb   $wpdb
- * @global object $current_site
+ * @global wpdb $wpdb
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
@@ -1388 +1384 @@
  */
 function update_network_option( $network_id, $option, $value ) {
-    global $wpdb, $current_site;
+    global $wpdb;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1397 +1393 @@
 
     // Fallback to the current network if a network ID is not specified.
-    if ( ! $network_id && is_multisite() ) {
-        $network_id = $current_site->id;
+    if ( ! $network_id ) {
+        $network_id = get_current_network_id();
     }
 

trunk/src/wp-login.php

@@ -99 +99 @@
     if ( is_multisite() ) {
         $login_header_url   = network_home_url();
-        $login_header_title = get_current_site()->site_name;
+        $login_header_title = get_network()->site_name;
     } else {
         $login_header_url   = __( 'https://wordpress.org/' );
@@ -333 +333 @@
 
     if ( is_multisite() ) {
-        $blogname = get_current_site()->site_name;
+        $blogname = get_network()->site_name;
     } else {
         /*

trunk/src/wp-signup.php

@@ -101 +101 @@
     }
 
-    $current_site = get_current_site();
+    $current_network = get_network();
     // Blog name
     if ( !is_subdomain_install() )
@@ -113 +113 @@
 
     if ( !is_subdomain_install() )
-        echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
+        echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
     else
-        echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
+        echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
 
     if ( ! is_user_logged_in() ) {
         if ( ! is_subdomain_install() ) {
-            $site = $current_site->domain . $current_site->path . __( 'sitename' );
+            $site = $current_network->domain . $current_network->path . __( 'sitename' );
         } else {
-            $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+            $site = __( 'domain' ) . '.' . $site_domain . $current_network->path;
         }
 
@@ -305 +305 @@
     $errors = $filtered_results['errors'];
 
-    echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
+    echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
 
     if ( $errors->get_error_code() ) {
@@ -533 +533 @@
     <h2><?php
         /* translators: %s: name of the network */
-        printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name );
+        printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
     ?></h2>
     <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">