WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Options: Make `$passed_default` available in remaining `default_option_{$option}` filter. 

Pass `false` as the `$passed_default` value when the `default_option_{$option}` filter is applied in `update_option` as no default is ever passed.

This resolves an error in tests where the 3rd parameter is not available to `filter_default_option()`.

Fixes #38176.

Built from https://develop.svn.wordpress.org/trunk@38916


git-svn-id: http://core.svn.wordpress.org/trunk@38859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-10-25 19:23:32 +00:00
parent 680f14fcd1
commit 8972cb70b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/option.php
View File

@ -300,7 +300,7 @@ function update_option( $option, $value, $autoload = null ) {
return false; return false;
/** This filter is documented in wp-includes/option.php */ /** This filter is documented in wp-includes/option.php */
if ( apply_filters( 'default_option_' . $option, false, $option ) === $old_value ) { if ( apply_filters( 'default_option_' . $option, false, $option, false ) === $old_value ) {
// Default setting for new options is 'yes'. // Default setting for new options is 'yes'.
if ( null === $autoload ) { if ( null === $autoload ) {
$autoload = 'yes'; $autoload = 'yes';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38915'; $wp_version = '4.7-alpha-38916';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.