Ticket #18422: 18422.2.diff

wp-includes/functions.php

@@ -3799 +3799 @@
                 $cache_key = "{$wpdb->siteid}:$option";
 
                 if ( $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ) )
-                        return update_site_option( $option, $value );
+                        return false;
 
                 $value = sanitize_option( $option, $value );
                 wp_cache_set( $cache_key, $value, 'site-options' );
@@ -3810 +3810 @@
                 $value = $_value;
         }
 
-        do_action( "add_site_option_{$option}", $option, $value );
-        do_action( "add_site_option", $option, $value );
+        if ( $result ) {
+                do_action( "add_site_option_{$option}", $option, $value );
+                do_action( "add_site_option", $option, $value );
+                return true;
+        }
 
-        return $result;
+        return false;
 }
 
 /**