Changeset 38388 for trunk/src/wp-includes/option.php

Timestamp:

08/26/2016 09:34:36 PM (9 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/option.php (modified) (12 diffs)

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