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

Timestamp:

10/02/2015 07:07:23 PM (11 years ago)

Author:

jeremyfelt

Message:

MS: Use *_network_option() functions throughout core.

Replaces all uses of *_site_option() with the corresponding "network" function.

This excludes one usage in wp-admin/admin-footer.php that needs more investigation.

Props spacedmonkey.
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;
@@ -1467 +1467 @@
         $option_timeout = '_site_transient_timeout_' . $transient;
         $option = '_site_transient_' . $transient;
-        $result = delete_site_option( $option );
+        $result = delete_network_option( $option );
         if ( $result )
-            delete_site_option( $option_timeout );
+            delete_network_option( $option_timeout );
     }
     if ( $result ) {
@@ -1530 +1530 @@
         if ( ! in_array( $transient, $no_timeout ) ) {
             $transient_timeout = '_site_transient_timeout_' . $transient;
-            $timeout = get_site_option( $transient_timeout );
+            $timeout = get_network_option( $transient_timeout );
             if ( false !== $timeout && $timeout < time() ) {
-                delete_site_option( $transient_option  );
-                delete_site_option( $transient_timeout );
+                delete_network_option( $transient_option  );
+                delete_network_option( $transient_timeout );
                 $value = false;
             }
@@ -1539 +1539 @@
 
         if ( ! isset( $value ) )
-            $value = get_site_option( $transient_option );
+            $value = get_network_option( $transient_option );
     }
 
@@ -1594 +1594 @@
         $transient_timeout = '_site_transient_timeout_' . $transient;
         $option = '_site_transient_' . $transient;
-        if ( false === get_site_option( $option ) ) {
+        if ( false === get_network_option( $option ) ) {
             if ( $expiration )
-                add_site_option( $transient_timeout, time() + $expiration );
-            $result = add_site_option( $option, $value );
+                add_network_option( $transient_timeout, time() + $expiration );
+            $result = add_network_option( $option, $value );
         } else {
             if ( $expiration )
-                update_site_option( $transient_timeout, time() + $expiration );
-            $result = update_site_option( $option, $value );
+                update_network_option( $transient_timeout, time() + $expiration );
+            $result = update_network_option( $option, $value );
         }
     }