diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index ed30cc5fe8..0ea6f85627 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -348,12 +348,12 @@ function clean_site_details_cache( $site_id = 0 ) { * * @since MU (3.0.0) * - * @param int $id A blog ID. Can be null to refer to the current blog. - * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. - * @param mixed $default Optional. Default value to return if the option does not exist. + * @param int $id A blog ID. Can be null to refer to the current blog. + * @param string $option Name of option to retrieve. Expected to not be SQL-escaped. + * @param mixed $default_value Optional. Default value to return if the option does not exist. * @return mixed Value set for the option. */ -function get_blog_option( $id, $option, $default = false ) { +function get_blog_option( $id, $option, $default_value = false ) { $id = (int) $id; if ( empty( $id ) ) { @@ -361,11 +361,11 @@ function get_blog_option( $id, $option, $default = false ) { } if ( get_current_blog_id() == $id ) { - return get_option( $option, $default ); + return get_option( $option, $default_value ); } switch_to_blog( $id ); - $value = get_option( $option, $default ); + $value = get_option( $option, $default_value ); restore_current_blog(); /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 6624465ad3..caf623664e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54944'; +$wp_version = '6.2-alpha-54945'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.