From ae42add90ef5b083368b87580fabbec1ada481f3 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 6 Dec 2022 22:14:40 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/ms-blogs.php`. While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit renames the `$default` parameter to `$default_value` in `get_blog_option()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@54945 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-blogs.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php index ed30cc5fe8..0ea6f85627 100644 --- a/src/wp-includes/ms-blogs.php +++ b/src/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(); /**