Make WordPress Core

Changeset 54945


Ignore:
Timestamp:
12/06/2022 10:14:40 PM (18 months ago)
Author:
SergeyBiryukov
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/ms-blogs.php

    r54637 r54945  
    349349 * @since MU (3.0.0)
    350350 *
    351  * @param int    $id      A blog ID. Can be null to refer to the current blog.
    352  * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
    353  * @param mixed  $default Optional. Default value to return if the option does not exist.
     351 * @param int    $id            A blog ID. Can be null to refer to the current blog.
     352 * @param string $option        Name of option to retrieve. Expected to not be SQL-escaped.
     353 * @param mixed  $default_value Optional. Default value to return if the option does not exist.
    354354 * @return mixed Value set for the option.
    355355 */
    356 function get_blog_option( $id, $option, $default = false ) {
     356function get_blog_option( $id, $option, $default_value = false ) {
    357357    $id = (int) $id;
    358358
     
    362362
    363363    if ( get_current_blog_id() == $id ) {
    364         return get_option( $option, $default );
     364        return get_option( $option, $default_value );
    365365    }
    366366
    367367    switch_to_blog( $id );
    368     $value = get_option( $option, $default );
     368    $value = get_option( $option, $default_value );
    369369    restore_current_blog();
    370370
Note: See TracChangeset for help on using the changeset viewer.