Changeset 37367

Timestamp:

05/05/2016 08:23:43 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Options: After [33738], consistently pass option name as the second parameter to the 'default_option_' . $option filter in add_option() and update_option().

Props dlh.
Fixes #36761.

File:

• trunk/src/wp-includes/option.php (modified) (2 diffs)

trunk/src/wp-includes/option.php

@@ -296 +296 @@
 
         /** This filter is documented in wp-includes/option.php */
-        if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
+        if ( apply_filters( 'default_option_' . $option, false, $option ) === $old_value ) {
                 // Default setting for new options is 'yes'.
                 if ( null === $autoload ) {
@@ -417 +417 @@
         if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
                 /** This filter is documented in wp-includes/option.php */
-                if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) )
+                if ( apply_filters( 'default_option_' . $option, false, $option ) !== get_option( $option ) )
                         return false;