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

Timestamp:

10/07/2015 05:11:01 PM (9 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

File:

• trunk/src/wp-includes/option.php (modified) (5 diffs)

trunk/src/wp-includes/option.php

@@ -89 +89 @@
                 } else { // option does not exist, so we must cache its non-existence
                     if ( ! is_array( $notoptions ) ) {
-                        $notoptions = array();
+                         $notoptions = array();
                     }
                     $notoptions[$option] = true;
@@ -1481 +1481 @@
         $option_timeout = '_site_transient_timeout_' . $transient;
         $option = '_site_transient_' . $transient;
-        $result = delete_network_option( $option );
+        $result = delete_site_option( $option );
         if ( $result )
-            delete_network_option( $option_timeout );
+            delete_site_option( $option_timeout );
     }
     if ( $result ) {
@@ -1544 +1544 @@
         if ( ! in_array( $transient, $no_timeout ) ) {
             $transient_timeout = '_site_transient_timeout_' . $transient;
-            $timeout = get_network_option( $transient_timeout );
+            $timeout = get_site_option( $transient_timeout );
             if ( false !== $timeout && $timeout < time() ) {
-                delete_network_option( $transient_option  );
-                delete_network_option( $transient_timeout );
+                delete_site_option( $transient_option  );
+                delete_site_option( $transient_timeout );
                 $value = false;
             }
@@ -1553 +1553 @@
 
         if ( ! isset( $value ) )
-            $value = get_network_option( $transient_option );
+            $value = get_site_option( $transient_option );
     }
 
@@ -1621 +1621 @@
         $transient_timeout = '_site_transient_timeout_' . $transient;
         $option = '_site_transient_' . $transient;
-        if ( false === get_network_option( $option ) ) {
+        if ( false === get_site_option( $option ) ) {
             if ( $expiration )
-                add_network_option( $transient_timeout, time() + $expiration );
-            $result = add_network_option( $option, $value );
+                add_site_option( $transient_timeout, time() + $expiration );
+            $result = add_site_option( $option, $value );
         } else {
             if ( $expiration )
-                update_network_option( $transient_timeout, time() + $expiration );
-            $result = update_network_option( $option, $value );
+                update_site_option( $transient_timeout, time() + $expiration );
+            $result = update_site_option( $option, $value );
         }
     }