Ticket #35379: 35379.diff

src/wp-includes/formatting.php

@@ -3637 +3637 @@
  *
  * @param string $option The name of the option.
  * @param string $value  The unsanitised value.
+ * @param string|boolean  $network_id     Optional. 
+ *                                                        Used when sanitizing a network option on a specific network ID. 
+ *                                                        Otherwise if is set to boolean TRUE, it will use the current site network ID
+ *                                                        Defaults to FALSE
+ * 
  * @return string Sanitized value.
  */
-function sanitize_option( $option, $value ) {
+function sanitize_option( $option, $value,$network_id=false) {
         global $wpdb;
 
         $original_value = $value;
         $error = '';
-
+        
+        $network_called=false;
+        if (( is_multisite() ) && ($network_id)) {
+                global $current_site;
+                if ((isset($current_site->id)) && (true === $network_id )) {                    
+                        $network_id = $current_site->id;        
+                } 
+                
+                $network_id = (int) $network_id;                
+                if ($network_id > 0) {
+                        $network_called=true;
+                }
+        }
+        
         switch ( $option ) {
                 case 'admin_email' :
                 case 'new_admin_email' :
@@ -3780 +3798 @@
                                 $allowed[] = WPLANG;
                         }
                         if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
-                                $value = get_option( $option );
+                                if ($network_called) {
+                                        $value = get_network_option( $network_id, $option, false );
+                                } else {
+                                        $value = get_option( $option );
+                                }
+                                
                         }
                         break;
 
@@ -3860 +3883 @@
         }
 
         if ( ! empty( $error ) ) {
-                $value = get_option( $option );
+                if ($network_called) {
+                        $value = get_network_option( $network_id, $option, false );
+                } else {
+                        $value = get_option( $option );
+                }
                 if ( function_exists( 'add_settings_error' ) ) {
                         add_settings_error( $option, "invalid_{$option}", $error );
                 }

src/wp-includes/option.php

@@ -1433 +1433 @@
         if ( ! is_multisite() ) {
                 $result = update_option( $option, $value );
         } else {
-                $value = sanitize_option( $option, $value );
+                $value = sanitize_option( $option, $value, $network_id);
 
                 $serialized_value = maybe_serialize( $value );
                 $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );