Ticket #38931: 38931.diff

src/wp-includes/option.php

@@ -319 +319 @@
          * @param string $option    Name of the option to update.
          * @param mixed  $old_value The old option value.
          * @param mixed  $value     The new option value.
          */
         do_action( 'update_option', $option, $old_value, $value );
 
         $update_args = array(
                 'option_value' => $serialized_value,
         );
 
         if ( null !== $autoload ) {
                 $update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
         }
 
         $result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-        if ( ! $result )
-                return false;
+        if ( ! $result ) {
+                // get_option() said the option exists, checks have said it should differ from what's in the DB. The UPDATE failed, suggesting that it might be in the cache-only and not the DB, so perform an add_option instead.
+                return add_option( $option, $value, '', $autoload );
+        }
 
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
                 unset( $notoptions[$option] );
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
         }
 
         if ( ! wp_installing() ) {
                 $alloptions = wp_load_alloptions();
                 if ( isset( $alloptions[$option] ) ) {
                         $alloptions[ $option ] = $serialized_value;
                         wp_cache_set( 'alloptions', $alloptions, 'options' );
                 } else {
                         wp_cache_set( $option, $serialized_value, 'options' );
                 }