Ticket #31245: 31245.5.fabian-race-fix.diff

src/wp-includes/option.php

@@ -189 +189 @@
  * Loads and caches all autoloaded options, if available or all options.
  *
  * @since 2.2.0
+ * @since 5.4.0 The `$force_cache` parameter was added.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
+ * @param bool $force_cache Optional. Whether to force an update of the local cache
+ *                          from the persistent cache. Default false.
  * @return array List of all options.
  */
-function wp_load_alloptions() {
+function wp_load_alloptions( $force_cache = false ) {
         global $wpdb;
 
         if ( ! wp_installing() || ! is_multisite() ) {
-                $alloptions = wp_cache_get( 'alloptions', 'options' );
+                $alloptions = wp_cache_get( 'alloptions', 'options', $force_cache );
         } else {
                 $alloptions = false;
         }
@@ -397 +400 @@
         }
 
         if ( ! wp_installing() ) {
-                $alloptions = wp_load_alloptions();
+                $alloptions = wp_load_alloptions( true );
                 if ( isset( $alloptions[ $option ] ) ) {
                         $alloptions[ $option ] = $serialized_value;
                         wp_cache_set( 'alloptions', $alloptions, 'options' );
@@ -505 +508 @@
 
         if ( ! wp_installing() ) {
                 if ( 'yes' == $autoload ) {
-                        $alloptions            = wp_load_alloptions();
+                        $alloptions            = wp_load_alloptions( true );
                         $alloptions[ $option ] = $serialized_value;
                         wp_cache_set( 'alloptions', $alloptions, 'options' );
                 } else {
@@ -583 +586 @@
         $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
         if ( ! wp_installing() ) {
                 if ( 'yes' == $row->autoload ) {
-                        $alloptions = wp_load_alloptions();
+                        $alloptions = wp_load_alloptions( true );
                         if ( is_array( $alloptions ) && isset( $alloptions[ $option ] ) ) {
                                 unset( $alloptions[ $option ] );
                                 wp_cache_set( 'alloptions', $alloptions, 'options' );