Ticket #22192: 22192.5.diff

src/wp-includes/option.php

@@ -264 +264 @@
          */
         $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 the new and old values are the same, no need to update.
+         * Scalar values in the cache will always be strings, so we must compare string values.
+         */
+        $values = array(
+                'old' => $old_value,
+                'new' => $value,
+        );
+
+        foreach ( $values as $_key => &$_value ) {
+                // Special handling for false-ish values.
+                if ( false === $_value ) {
+                        $_value = '0';
+
+                // Empty strings in the database should be seen as equivalent to false-ish cache values.
+                } elseif ( 'old' === $_key && '' === $_value ) {
+                        $_value = '0';
+
+                // Cast scalars to a string so type discrepancies don't result in cache misses.
+                } elseif ( is_scalar( $_value ) ) {
+                        $_value = (string) $_value;
+                }
+        }
+
+        if ( $values['old'] === $values['new'] ) {
                 return false;
+        }
 
         if ( false === $old_value )
                 return add_option( $option, $value );

tests/phpunit/tests/option/option.php

@@ -99 +99 @@
         function test_special_option_name_notoptions() {
                 delete_option( 'notoptions' );
         }
+
+        /**
+         * @ticket 22192
+         */
+        public function test_add_option_with_value_of_false_should_store_false_in_the_cache() {
+                add_option( 'foo', false );
+                $a = wp_cache_get( 'alloptions', 'options' );
+                $this->assertSame( false, $a['foo'] );
+        }
+
+        /**
+         * @ticket 22192
+         */
+        public function test_add_option_with_value_of_false_should_store_empty_string_in_the_database() {
+                add_option( 'foo', false );
+
+                // Delete cache to ensure we pull from the database.
+                wp_cache_delete( 'alloptions', 'options' );
+
+                $this->assertSame( '', get_option( 'foo' ) );
+        }
+
+        /**
+         * @ticket 22192
+         * @dataProvider data_update_option_type_juggling
+         */
+        public function test_update_option_should_hit_cache_when_loosely_equal_to_existing_value_and_cached_values_are_faithful_to_original_type( $old_value, $new_value ) {
+                global $wpdb;
+
+                add_option( 'foo', $old_value );
+                $num_queries = $wpdb->num_queries;
+
+                $updated = update_option( 'foo', $new_value );
+
+                $this->assertFalse( $updated );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 22192
+         * @dataProvider data_update_option_type_juggling
+         */
+        public function test_update_option_should_hit_cache_when_loosely_equal_to_existing_value_and_cached_values_are_pulled_from_the_database( $old_value, $new_value ) {
+                global $wpdb;
+
+                add_option( 'foo', $old_value );
+                wp_cache_delete( 'alloptions', 'options' );
+                wp_load_alloptions();
+
+                $num_queries = $wpdb->num_queries;
+
+                $updated = update_option( 'foo', $new_value );
+
+                $this->assertFalse( $updated );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+        }
+
+        public function data_update_option_type_juggling() {
+                return array(
+                        // Truthy
+                        array( '1', '1' ),
+                        array( '1', intval( 1 ) ),
+                        array( '1', floatval( 1 ) ),
+                        array( '1', true ),
+                        array( 1, '1' ),
+                        array( 1, intval( 1 ) ),
+                        array( 1, floatval( 1 ) ),
+                        array( 1, true ),
+                        array( floatval( 1 ), '1' ),
+                        array( floatval( 1 ), intval( 1 ) ),
+                        array( floatval( 1 ), floatval( 1 ) ),
+                        array( floatval( 1 ), true ),
+                        array( true, '1' ),
+                        array( true, intval( 1 ) ),
+                        array( true, floatval( 1 ) ),
+                        array( true, true ),
+
+                        // Falsey
+                        array( '0', '0' ),
+                        array( '0', intval( 0 ) ),
+                        array( '0', floatval( 0 ) ),
+                        array( '0', false ),
+                        array( 0, '0' ),
+                        array( 0, intval( 0 ) ),
+                        array( 0, floatval( 0 ) ),
+                        array( 0, false ),
+                        array( floatval( 0 ), '0' ),
+                        array( floatval( 0 ), intval( 0 ) ),
+                        array( floatval( 0 ), floatval( 0 ) ),
+                        array( floatval( 0 ), false ),
+                        array( false, '0' ),
+                        array( false, intval( 0 ) ),
+                        array( false, floatval( 0 ) ),
+                        array( false, false ),
+                );
+        }
 }