Ticket #26402: 26402.2.diff

src/wp-includes/option.php

@@ -1264 +1264 @@
                 $serialized_value = maybe_serialize( $value );
                 $result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value ) );
 
-                if ( ! $result ) {
+                if ( ! $result )
+                                if ( ! defined( 'WP_INSTALLING' ) ) { 
+                                                $alloptions = wp_load_alloptions(); 
+                                                if ( isset( $alloptions[$option] ) ) { 
+                                                                unset($alloptions[$option]); 
+                                                                wp_cache_set( 'alloptions', $alloptions, 'options' ); 
+                                                } 
+                                } else if ( !isset( $alloptions[$option] ) ) { 
+                                                wp_cache_delete( 'alloptions', 'options' ); 
+                                } else { 
+                                                wp_cache_delete( $option, 'options' ); 
+                                } 
+                                add_option( $option, $newvalue ); 
+
                         return false;
                 }