Ticket #26394: 26394.4.diff

src/wp-includes/option.php

@@ -221 +221 @@
  * to set whether an option is autoloaded, then you need to use the add_option().
  *
  * @since 1.0.0
+ * @since 4.2.0 The `$autoload` parameter was added.
  *
  * @param string $option Option name. Expected to not be SQL-escaped.
  * @param mixed $value Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
+ * @param string Optional. $autoload Autoload by default, while allowing it to be changed.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_option( $option, $value ) {
+function update_option( $option, $value, $autoload = 'yes' ) {
         global $wpdb;
 
-        $option = trim($option);
-        if ( empty($option) )
+        $option = trim( $option );
+        if ( empty( $option ) ) {
                 return false;
+        }
 
         wp_protect_special_option( $option );
 
-        if ( is_object( $value ) )
+        if ( is_object( $value ) ) {
                 $value = clone $value;
+        }
 
         $value = sanitize_option( $option, $value );
         $old_value = get_option( $option );
@@ -265 +269 @@
         $value = apply_filters( 'pre_update_option', $value, $option, $old_value );
 
         // If the new and old values are the same, no need to update.
-        if ( $value === $old_value )
+        if ( $value === $old_value ) {
                 return false;
+        }
 
         /** This filter is documented in wp-includes/option.php */
-        if ( apply_filters( 'default_option_' . $option, false ) === $old_value )
-                return add_option( $option, $value );
+        if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
+                return add_option( $option, $value, '', $autoload );
+        }
 
         $serialized_value = maybe_serialize( $value );
 
@@ -286 +292 @@
         do_action( 'update_option', $option, $old_value, $value );
 
         $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
-        if ( ! $result )
+        if ( ! $result ) {
                 return false;
+        }
 
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {

tests/phpunit/tests/option/option.php

@@ -149 +149 @@
                 $actual = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s LIMIT 1", $name ) );
                 $this->assertEquals( $expected, $actual->autoload );
         }
+
+        function test_option_update_default() {
+                global $wpdb;
+                wp_cache_flush();
+                update_option( 'test_update_option_default', 'value' );
+                wp_cache_flush();
+                $before = $wpdb->num_queries;
+                $value = get_option( 'test_update_option_default' );
+                $after = $wpdb->num_queries;
+                $this->assertEquals( ++$before, $after );
+                $this->assertEquals( $value, 'value' );
+        }
+
+        function test_option_update_w_autoload() {
+                global $wpdb;
+                wp_cache_flush();
+                update_option( 'test_update_option_default', 'value', 'yes' );
+                wp_cache_flush();
+                $before = $wpdb->num_queries;
+                $value = get_option( 'test_update_option_default' );
+                $after = $wpdb->num_queries;
+                $this->assertEquals( ++$before, $after );
+                $this->assertEquals( $value, 'value' );
+        }
+
+        function test_option_update_wo_autoload() {
+                global $wpdb;
+                wp_cache_flush();
+                update_option( 'test_update_option_default', 'value', 'no' );
+                wp_cache_flush();
+                $before = $wpdb->num_queries;
+                $value = get_option( 'test_update_option_default' );
+                $after = $wpdb->num_queries;
+                $this->assertEquals( 2 + $before, $after );
+                $this->assertEquals( $value, 'value' );
+        }
 }