Ticket #31245: fabian-race-fix.diff

wp-includes/option.php

@@ -173 +173 @@
  * @since 2.2.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @return array List of all options.
  */
-function wp_load_alloptions() {
+function wp_load_alloptions($force_cache = false) {
         global $wpdb;
 
         if ( wp_using_ext_object_cache() && (! wp_installing() || ! is_multisite() ) )
-                $alloptions = wp_cache_get( 'alloptions', 'options' );
+                $alloptions = wp_cache_get( 'alloptions', 'options', $force_cache );
         else
                 $alloptions = false;
 
         if ( !$alloptions ) {
                 $suppress = $wpdb->suppress_errors();
                 if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
@@ -347 +347 @@
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
                 unset( $notoptions[$option] );
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
         }
 
         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' );
                 } else {
                         wp_cache_set( $option, $serialized_value, 'options' );
                 }