Ticket #21989: no-double-handling-2.patch

wp-includes/option.php

@@ -461 +461 @@
                 $value = clone $value;
         }
 
-        $value     = sanitize_option( $option, $value );
         $old_value = get_option( $option );
 
+        $notoptions = wp_cache_get( 'notoptions', 'options' );
+
+        if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
+                /** This filter is documented in wp-includes/option.php */
+                if ( apply_filters( "default_option_{$option}", false, $option, false ) === $old_value ) {
+                        // Default setting for new options is 'yes'.
+                        if ( null === $autoload ) {
+                                $autoload = 'yes';
+                        }
+
+                        return add_option( $option, $value, '', $autoload );
+                }
+
+                return false;
+        }
+
+        $value = sanitize_option( $option, $value );
+
         /**
          * Filters a specific option before its value is (maybe) serialized and updated.
          *
@@ -502 +519 @@
                 return false;
         }
 
-        /** This filter is documented in wp-includes/option.php */
-        if ( apply_filters( "default_option_{$option}", false, $option, false ) === $old_value ) {
-                // Default setting for new options is 'yes'.
-                if ( null === $autoload ) {
-                        $autoload = 'yes';
-                }
-
-                return add_option( $option, $value, '', $autoload );
-        }
-
         $serialized_value = maybe_serialize( $value );
 
         /**