Ticket #22192: 22192.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.
+         */
+        if ( is_scalar( $value ) ) {
+                $_value = (string) $value;
+        } else {
+                $_value = $value;
+        }
+
+        if ( $_value === $old_value )
                 return false;
 
         if ( false === $old_value )

tests/phpunit/tests/option/option.php

@@ -99 +99 @@
         function test_special_option_name_notoptions() {
                 delete_option( 'notoptions' );
         }
+
+        /**
+         * @ticket 22192
+         */
+        public function test_update_option_should_fail_when_passing_an_int_that_is_loosely_equal_to_existing_option_and_option_is_in_cache() {
+                add_option( 'foo', '1' );
+
+                global $wpdb;
+                $num_queries = $wpdb->num_queries;
+
+                $updated = update_option( 'foo', 1 );
+
+                $this->assertFalse( $updated );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertFalse( update_option( 'foo', 1 ) );
+        }
+
+        /**
+         * @ticket 22192
+         */
+        public function test_update_option_should_fail_when_passing_a_float_that_is_loosely_equal_to_existing_option_and_option_is_in_cache() {
+                add_option( 'foo', '1' );
+
+                global $wpdb;
+                $num_queries = $wpdb->num_queries;
+
+                $updated = update_option( 'foo', floatval( 1 ) );
+
+                $this->assertFalse( $updated );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertFalse( update_option( 'foo', 1 ) );
+        }
 }