Changeset 38388 for trunk/src/wp-includes/ms-functions.php

Timestamp:

08/26/2016 09:34:36 PM (10 years ago)

Author:

wonderboymusic

Message:

Multisite: move get_current_site() to load.php so that it can be used in more places, instead of importing global $current_site.

See #37699.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (4 diffs)

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

@@ -1333 +1333 @@
  */
 function install_blog( $blog_id, $blog_title = '' ) {
-        global $wpdb, $wp_roles, $current_site;
-
+        global $wpdb, $wp_roles;
         // Cast for security
         $blog_id = (int) $blog_id;
@@ -1362 +1361 @@
                         $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_current_site()->blog_id ), PHP_URL_SCHEME ) ) {
                         $home = set_url_scheme( $home, 'https' );
                 }
@@ -1499 +1498 @@
         $message = $welcome_email;
 
-        if ( empty( $current_site->site_name ) )
+        if ( empty( $current_site->site_name ) ) {
                 $current_site->site_name = 'WordPress';
+        }
 
         /**
@@ -1590 +1590 @@
         wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
         return true;
-}
-
-/**
- * Get the current network.
- *
- * Returns an object containing the 'id', 'domain', 'path', and 'site_name'
- * properties of the network being viewed.
- *
- * @see wpmu_current_site()
- *
- * @since MU
- *
- * @global WP_Network $current_site
- *
- * @return WP_Network
- */
-function get_current_site() {
-        global $current_site;
-        return $current_site;
 }