Changeset 42655

Timestamp:

02/06/2018 02:48:46 PM (9 years ago)

Author:

flixos90

Message:

Options: Unhook default option filter when setting is unregistered.

Fixes #43207.

Location:

trunk

Files:

• src/wp-includes/option.php (modified) (1 diff)
• tests/phpunit/tests/option/registration.php (modified) (1 diff)

trunk/src/wp-includes/option.php

@@ -2183 +2183 @@
                 }
 
+                // Remove the default filter if a default was provided during registration.
+                if ( array_key_exists( 'default', $wp_registered_settings[ $option_name ] ) ) {
+                        remove_filter( "default_option_{$option_name}", 'filter_default_option', 10 );
+                }
+
                 unset( $wp_registered_settings[ $option_name ] );
         }

trunk/tests/phpunit/tests/option/registration.php

@@ -95 +95 @@
                 register_setting( 'privacy', 'test_option' );
         }
+
+        /**
+         * @ticket 43207
+         */
+        public function test_unregister_setting_removes_default() {
+                register_setting(
+                        'test_group', 'test_default', array(
+                                'default' => 'Fuck Cancer',
+                        )
+                );
+
+                unregister_setting( 'test_group', 'test_default' );
+
+                $this->assertFalse( has_filter( 'default_option_test_default', 'filter_default_option' ) );
+        }
 }