Ticket #59738: 59738.diff

src/wp-includes/option.php

@@ -275 +275 @@
                 return;
         }
 
+        // Filter options that are known not to exist.
+        $notoptions = wp_cache_get( 'notoptions', 'options' );
+        if ( ! is_array( $notoptions ) ) {
+                $notoptions = array();
+        }
+        $options_to_prime = array_diff( $options_to_prime, array_keys( $notoptions ) );
+
+        // Bail early if there are no options to be loaded.
+        if ( empty( $options_to_prime ) ) {
+                return;
+        }
+
         global $wpdb;
         $results = $wpdb->get_results(
                 $wpdb->prepare(

tests/phpunit/tests/option/wpLoadOptions.php

@@ -96 +96 @@
                 foreach ( $options_to_load as $option ) {
                         $this->assertArrayHasKey( $option, $new_notoptions, "$option was not added to the notoptions cache." );
                 }
+
+                $initial_num_queries = get_num_queries();
+
+                // Check getting the options does not result in a database query.
+                foreach ( $options_to_load as $option ) {
+                        get_option( $option );
+                        $this->assertSame( 0, get_num_queries() - $initial_num_queries, "Loading notoption '{$option}' resulted in a database query." );
+                }
+
+                // Check re-loading does not result in a database query.
+                wp_load_options( $options_to_load );
+                $this->assertSame( 0, get_num_queries() - $initial_num_queries, 'Reloading resulted in a database query.' );
         }
 
         /**
@@ -111 +123 @@
 
                 $this->assertSame( $alloptions, wp_cache_get( 'alloptions', 'options' ), 'The alloptions cache was modified.' );
                 $this->assertSame( $notoptions, wp_cache_get( 'notoptions', 'options' ), 'The notoptions cache was modified.' );
+
+                $initial_num_queries = get_num_queries();
+
+                // Check re-loading does not result in a database query.
+                wp_load_options( array() );
+                $this->assertSame( 0, get_num_queries() - $initial_num_queries, 'Reloading resulted in a database query.' );
         }
 
         /**
@@ -126 +144 @@
                 $notoptions = wp_cache_get( 'notoptions', 'options' );
                 $this->assertIsArray( $notoptions, 'The notoptions cache should be an array.' );
                 $this->assertArrayHasKey( 'nonexistent_option', $notoptions, 'nonexistent_option was not added to notoptions.' );
+
+                $initial_num_queries = get_num_queries();
+
+                // Check getting the options does not result in a database query.
+                get_option( 'nonexistent_option' );
+                $this->assertSame( 0, get_num_queries() - $initial_num_queries, "Loading notoption 'nonexistent_option' resulted in a database query." );
+
+                // Check re-loading does not result in a database query.
+                wp_load_options( array( 'nonexistent_option' ) );
+                $this->assertSame( 0, get_num_queries() - $initial_num_queries, 'Reloading resulted in a database query.' );
         }
 }