Ticket #38930: 38930.diff

src/wp-includes/option.php

@@ -421 +421 @@
         $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 ) !== get_option( $option ) )
+                if ( apply_filters( 'default_option_' . $option, false, $option, false ) !== get_option( $option ) )
                         return false;
 
         $serialized_value = maybe_serialize( $value );

tests/phpunit/tests/option/registration.php

@@ -62 +62 @@
         }
 
         /**
+         * @ticket 38930
+         */
+        public function test_add_option_with_no_options_cache() {
+                register_setting( 'test_group', 'test_default', array(
+                        'default' => 'My Default :)',
+                ));
+                wp_cache_delete( 'notoptions', 'options' );
+                $this->assertTrue( add_option( 'test_default', 'hello' ) );
+                $this->assertEquals( 'hello', get_option( 'test_default' ) );
+        }
+
+        /**
          * @expectedDeprecated register_setting
          */
         public function test_register_deprecated_group_misc() {