Changeset 38388

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.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (2 diffs)
• link-template.php (modified) (2 diffs)
• load.php (modified) (1 diff)
• ms-blogs.php (modified) (1 diff)
• ms-functions.php (modified) (4 diffs)
• option.php (modified) (12 diffs)

trunk/src/wp-includes/functions.php

@@ -4276 +4276 @@
  * @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
@@ -4283 +4281 @@
  */
 function is_main_site( $site_id = null ) {
-        // This is the current network's information; 'site' is old terminology.
-        global $current_site;
-
-        if ( ! is_multisite() )
+        if ( ! is_multisite() ) {
                 return true;
-
-        if ( ! $site_id )
+        }
+
+        if ( ! $site_id ) {
                 $site_id = get_current_blog_id();
-
-        return (int) $site_id === (int) $current_site->blog_id;
+        }
+        return (int) $site_id === (int) get_current_site()->blog_id;
 }
 

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

@@ -3264 +3264 @@
         $current_site = get_current_site();
 
-        if ( 'relative' == $scheme )
+        if ( 'relative' == $scheme ) {
                 $url = $current_site->path;
-        else
+        } else {
                 $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
-
-        if ( $path && is_string( $path ) )
+        }
+
+        if ( $path && is_string( $path ) ) {
                 $url .= ltrim( $path, '/' );
+        }
 
         /**
@@ -3310 +3312 @@
                 $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-        if ( 'relative' == $scheme )
+        if ( 'relative' == $scheme ) {
                 $url = $current_site->path;
-        else
+        } else {
                 $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
-
-        if ( $path && is_string( $path ) )
+        }
+
+        if ( $path && is_string( $path ) ) {
                 $url .= ltrim( $path, '/' );
+        }
 
         /**

trunk/src/wp-includes/load.php

@@ -1060 +1060 @@
         return ( $thing instanceof WP_Error );
 }
+
+/**
+ * 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;
+}

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

@@ -1084 +1084 @@
  * @since 4.6.0
  *
- * @global WP_Network $current_site
- *
  * @param WP_Network|int|null $network Optional. Network to retrieve. Default is the current network.
  * @return WP_Network|null The network object or null if not found.
  */
 function get_network( $network = null ) {
-        global $current_site;
+        $current_site = get_current_site();
         if ( empty( $network ) && isset( $current_site ) ) {
                 $network = $current_site;

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;
 }
 

trunk/src/wp-includes/option.php

@@ -1071 +1071 @@
  *
  * @global wpdb   $wpdb
- * @global object $current_site
  *
  * @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 ) ) {
@@ -1089 +1088 @@
         // Fallback to the current network if a network ID is not specified.
         if ( ! $network_id && is_multisite() ) {
-                $network_id = $current_site->id;
+                $network_id = get_current_site()->id;
         }
 
@@ -1188 +1187 @@
  *
  * @global wpdb   $wpdb
- * @global object $current_site
  *
  * @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 ) ) {
@@ -1206 +1204 @@
         // Fallback to the current network if a network ID is not specified.
         if ( ! $network_id && is_multisite() ) {
-                $network_id = $current_site->id;
+                $network_id = get_current_site()->id;
         }
 
@@ -1298 +1296 @@
  *
  * @global wpdb   $wpdb
- * @global object $current_site
  *
  * @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 ) ) {
@@ -1315 +1312 @@
         // Fallback to the current network if a network ID is not specified.
         if ( ! $network_id && is_multisite() ) {
-                $network_id = $current_site->id;
+                $network_id = get_current_site()->id;
         }
 
@@ -1380 +1377 @@
  *
  * @global wpdb   $wpdb
- * @global object $current_site
  *
  * @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 ) ) {
@@ -1398 +1394 @@
         // Fallback to the current network if a network ID is not specified.
         if ( ! $network_id && is_multisite() ) {
-                $network_id = $current_site->id;
+                $network_id = get_current_site()->id;
         }