General: Use interpolation instead of concatenation for all dynamic hook names.

This fixes the rendering of the hook names on developer.wordpress.org.

Props keesiemeijer
Fixes #39148


git-svn-id: https://develop.svn.wordpress.org/trunk@39600 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2016-12-14 04:17:38 +00:00
parent c0bb5e4972
commit ca92da24da
12 changed files with 31 additions and 21 deletions

View File

@@ -102,7 +102,7 @@ function get_option( $option, $default = false ) {
wp_cache_set( 'notoptions', $notoptions, 'options' );
/** This filter is documented in wp-includes/option.php */
return apply_filters( 'default_option_' . $option, $default, $option, $passed_default );
return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
}
}
}
@@ -114,7 +114,7 @@ function get_option( $option, $default = false ) {
$value = $row->option_value;
} else {
/** This filter is documented in wp-includes/option.php */
return apply_filters( 'default_option_' . $option, $default, $option, $passed_default );
return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
}
}
@@ -309,7 +309,7 @@ function update_option( $option, $value, $autoload = null ) {
}
/** This filter is documented in wp-includes/option.php */
if ( apply_filters( 'default_option_' . $option, false, $option, false ) === $old_value ) {
if ( apply_filters( "default_option_{$option}", false, $option, false ) === $old_value ) {
// Default setting for new options is 'yes'.
if ( null === $autoload ) {
$autoload = 'yes';
@@ -430,7 +430,7 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
$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 ) !== get_option( $option ) )
if ( apply_filters( "default_option_{$option}", false, $option, false ) !== get_option( $option ) )
return false;
$serialized_value = maybe_serialize( $value );