Ticket #22846: 22846.3.diff

src/wp-includes/option.php

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

tests/phpunit/tests/option/networkOption.php

@@ -53 +53 @@
         }
 
         /**
+         * @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
          *
          * @param $network_id

tests/phpunit/tests/option/siteTransient.php

@@ -41 +41 @@
                 $this->assertEquals( $value, get_site_transient( $key ) );
                 $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 ] ) );
+        }
 }