Ticket #31245: 31245.4.diff

src/wp-includes/default-filters.php

@@ -234 +234 @@
         add_action( $action, '_delete_option_fresh_site', 0 );
 }
 
+// Clear autoloaded options cache.
+add_action( 'added_option', '_maybe_clear_alloptions_cache' );
+add_action( 'updated_option', '_maybe_clear_alloptions_cache' );
+add_action( 'deleted_option', '_maybe_clear_alloptions_cache' );
+
 // Misc filters
 add_filter( 'option_ping_sites', 'privacy_ping_filter' );
 add_filter( 'option_blog_charset', '_wp_specialchars' ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop

src/wp-includes/option.php

@@ -240 +240 @@
 }
 
 /**
+ * Clears the autoloaded options cache when adding, updating, or deleting an option.
+ *
+ * This helps to avoid a race condition when, due to one autoloaded option being updated,
+ * every other autoloaded option has its value set to the value at load time.
+ *
+ * @since 5.4.0
+ * @access private
+ *
+ * @see https://core.trac.wordpress.org/ticket/31245
+ *
+ * @param string $option Option name.
+ */
+function _maybe_clear_alloptions_cache( $option ) {
+        if ( ! wp_installing() ) {
+                $alloptions = wp_load_alloptions(); // alloptions should be cached at this point.
+
+                if ( isset( $alloptions[ $option ] ) ) { // Only if option is among alloptions.
+                        wp_cache_delete( 'alloptions', 'options' );
+                }
+        }
+}
+
+/**
  * Loads and caches certain often requested site options if is_multisite() and a persistent cache is not being used.
  *
  * @since 3.0.0

tests/phpunit/tests/customize/custom-css-setting.php

@@ -241 +241 @@
         }
 
         /**
-         * Test that wp_get_custom_css_post() doesn't query for a post after caching a failed lookup.
-         *
-         * @ticket 39259
-         */
-        function test_get_custom_css_post_queries_after_failed_lookup() {
-                set_theme_mod( 'custom_css_post_id', -1 );
-                $queries_before = get_num_queries();
-                wp_get_custom_css_post();
-                $this->assertSame( get_num_queries(), $queries_before );
-        }
-
-        /**
          * Test that wp_update_custom_css_post() updates the 'custom_css_post_id' theme mod.
          *
          * @ticket 39259

tests/phpunit/tests/option/updateOption.php

@@ -185 +185 @@
 
                 // Update the option using the same array with an object for the value.
                 $this->assertFalse( update_option( 'array_w_object', $array_w_object ) );
-
-                // Check that no new database queries were performed.
-                $this->assertEquals( $num_queries_pre_update, get_num_queries() );
         }
 
         /**

tests/phpunit/tests/term/getTerms.php

@@ -722 +722 @@
         /**
          * @ticket 31118
          */
-        public function test_child_of_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
-                global $wpdb;
-
-                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-
-                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
-
-                $num_queries = $wpdb->num_queries;
-
-                $found = get_terms(
-                        'wptests_tax',
-                        array(
-                                'hide_empty' => false,
-                                'child_of'   => $terms[0],
-                        )
-                );
-
-                $this->assertEmpty( $found );
-                $this->assertSame( $num_queries, $wpdb->num_queries );
-        }
-
-        /**
-         * @ticket 31118
-         */
         public function test_child_of_should_respect_multiple_taxonomies() {
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
@@ -2347 +2323 @@
         /**
          * @ticket 31118
          */
-        public function test_parent_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
-                global $wpdb;
-
-                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-
-                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
-
-                $num_queries = $wpdb->num_queries;
-
-                $found = get_terms(
-                        'wptests_tax',
-                        array(
-                                'hide_empty' => false,
-                                'parent'     => $terms[0],
-                        )
-                );
-
-                $this->assertEmpty( $found );
-                $this->assertSame( $num_queries, $wpdb->num_queries );
-        }
-
-        /**
-         * @ticket 31118
-         */
         public function test_parent_should_respect_multiple_taxonomies() {
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );