Ticket #21989: 21989.diff

src/wp-includes/option.php

@@ -240 +240 @@
         if ( is_object( $value ) )
                 $value = clone $value;
 
-        $value = sanitize_option( $option, $value );
         $old_value = get_option( $option );
+        if ( false === $old_value )
+                return add_option( $option, $value );
 
+        $value = sanitize_option( $option, $value );
+
         /**
          * Filter a specific option before its value is (maybe) serialized and updated.
          *
@@ -270 +273 @@
         if ( $value === $old_value )
                 return false;
 
-        if ( false === $old_value )
-                return add_option( $option, $value );
-
         $serialized_value = maybe_serialize( $value );
 
         /**
@@ -1166 +1166 @@
         wp_protect_special_option( $option );
 
         $old_value = get_site_option( $option );
+        if ( false === $old_value )
+                return add_site_option( $option, $value );
 
         /**
          * Filter a specific site option before its value is updated.
@@ -1183 +1185 @@
         if ( $value === $old_value )
                 return false;
 
-        if ( false === $old_value )
-                return add_site_option( $option, $value );
-
         $notoptions_key = "{$wpdb->siteid}:notoptions";
         $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {