Changeset 37223

Timestamp:

04/16/2016 07:47:14 PM (9 years ago)

Author:

jeremyfelt

Message:

Options: Do not set network options to autoload in single site

When multisite is not configured, the _site_transient() and _site_option() functions fallback to _option() and store network "meta/options" in wp_options.

Previously, those calls to _option() did not explicitly set the autoload parameter and anything assigned as a transient or option at the network level would be set to autoload by default, even though autoload is not yet a concept at the network option level.

This changes that behavior and forces the autoload setting to no. If autoload is desired, the single site option functions should be used.

Props thomaswm.
Fixes #22846.

Location:

trunk

Files:

• src/wp-includes/option.php (modified) (2 diffs)
• tests/phpunit/tests/option/networkOption.php (modified) (1 diff)
• tests/phpunit/tests/option/siteTransient.php (modified) (1 diff)

trunk/src/wp-includes/option.php

@@ -1224 +1224 @@
 
     if ( ! is_multisite() ) {
-        $result = add_option( $option, $value );
+        $result = add_option( $option, $value, '', 'no' );
     } else {
         $cache_key = "$network_id:$option";
@@ -1432 +1432 @@
 
     if ( ! is_multisite() ) {
-        $result = update_option( $option, $value );
+        $result = update_option( $option, $value, 'no' );
     } else {
         $value = sanitize_option( $option, $value );

trunk/tests/phpunit/tests/option/networkOption.php

@@ -54 +54 @@
 
     /**
+     * @ticket 22846
+     */
+    public function test_add_network_option_is_not_stored_as_autoload_option() {
+        $key = rand_str();
+
+        if ( is_multisite() ) {
+            $this->markTestSkipped( 'Does not apply when used in multisite.' );
+        }
+
+        add_network_option( null, $key, 'Not an autoload option' );
+
+        $options = wp_load_alloptions();
+
+        $this->assertFalse( isset( $options[ $key ] ) );
+    }
+
+    /**
+     * @ticket 22846
+     */
+    public function test_update_network_option_is_not_stored_as_autoload_option() {
+        $key = rand_str();
+
+        if ( is_multisite() ) {
+            $this->markTestSkipped( 'Does not apply when used in multisite.' );
+        }
+
+        update_network_option( null, $key, 'Not an autoload option' );
+
+        $options = wp_load_alloptions();
+
+        $this->assertFalse( isset( $options[ $key ] ) );
+    }
+
+    /**
      * @dataProvider data_network_id_parameter
      *

trunk/tests/phpunit/tests/option/siteTransient.php

@@ -42 +42 @@
         $this->assertTrue( delete_site_transient( $key ) );
     }
+
+    /**
+     * @ticket 22846
+     */
+    public function test_set_site_transient_is_not_stored_as_autoload_option() {
+        $key = rand_str();
+
+        if ( is_multisite() ) {
+            $this->markTestSkipped( 'Does not apply when used in multisite.' );
+        }
+        set_site_transient( $key, 'Not an autoload option' );
+
+        $options = wp_load_alloptions();
+
+        $this->assertFalse( isset( $options[ '_site_transient_' . $key ] ) );
+    }
 }