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

Timestamp:

09/20/2016 09:38:08 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Revert [38388].

Restore get_current_site() to a multisite only function. Providing this in single site may be a possibility in the future, but should have a dedicated ticket and discussion.

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.
@@ -1078 +1079 @@
  */
 function get_network_option( $network_id, $option, $default = false ) {
-    global $wpdb;
+    global $wpdb, $current_site;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1088 +1089 @@
     // Fallback to the current network if a network ID is not specified.
     if ( ! $network_id && is_multisite() ) {
-        $network_id = get_current_site()->id;
+        $network_id = $current_site->id;
     }
 
@@ -1187 +1188 @@
  *
  * @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.
@@ -1194 +1196 @@
  */
 function add_network_option( $network_id, $option, $value ) {
-    global $wpdb;
+    global $wpdb, $current_site;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1204 +1206 @@
     // Fallback to the current network if a network ID is not specified.
     if ( ! $network_id && is_multisite() ) {
-        $network_id = get_current_site()->id;
+        $network_id = $current_site->id;
     }
 
@@ -1296 +1298 @@
  *
  * @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.
@@ -1302 +1305 @@
  */
 function delete_network_option( $network_id, $option ) {
-    global $wpdb;
+    global $wpdb, $current_site;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1312 +1315 @@
     // Fallback to the current network if a network ID is not specified.
     if ( ! $network_id && is_multisite() ) {
-        $network_id = get_current_site()->id;
+        $network_id = $current_site->id;
     }
 
@@ -1377 +1380 @@
  *
  * @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.
@@ -1384 +1388 @@
  */
 function update_network_option( $network_id, $option, $value ) {
-    global $wpdb;
+    global $wpdb, $current_site;
 
     if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1394 +1398 @@
     // Fallback to the current network if a network ID is not specified.
     if ( ! $network_id && is_multisite() ) {
-        $network_id = get_current_site()->id;
+        $network_id = $current_site->id;
     }