Make WordPress Core


Ignore:
Timestamp:
06/22/2020 05:24:34 PM (4 years ago)
Author:
desrosj
Message:

General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.

“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the $new_whitelist_options global variable) are removed. A new ticket has been opened to explore renaming the $new_whitelist_options variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.

File:
1 edited

Legend:

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

    r48110 r48121  
    442442 *
    443443 * Verifies the validity and uniqueness of user names and user email addresses,
    444  * and checks email addresses against admin-provided domain whitelists and blacklists.
     444 * and checks email addresses against allowed and disallowed domains provided by
     445 * administrators.
    445446 *
    446447 * The {@see 'wpmu_validate_user_signup'} hook provides an easy way to modify the sign-up
     
    13591360    }
    13601361
    1361     $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
     1362    $allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
    13621363
    13631364    $site_data = array_merge(
     
    13671368            'network_id' => $network_id,
    13681369        ),
    1369         array_intersect_key( $options, array_flip( $site_data_whitelist ) )
     1370        array_intersect_key( $options, array_flip( $allowed_data_fields ) )
    13701371    );
    13711372
     
    13741375        'title'   => $title,
    13751376        'user_id' => $user_id,
    1376         'options' => array_diff_key( $options, array_flip( $site_data_whitelist ) ),
     1377        'options' => array_diff_key( $options, array_flip( $allowed_data_fields ) ),
    13771378    );
    13781379
     
    18411842
    18421843/**
    1843  * Check an array of MIME types against a whitelist.
     1844 * Check an array of MIME types against a list of allowed types.
    18441845 *
    18451846 * WordPress ships with a set of allowed upload filetypes,
    18461847 * which is defined in wp-includes/functions.php in
    18471848 * get_allowed_mime_types(). This function is used to filter
    1848  * that list against the filetype whitelist provided by Multisite
     1849 * that list against the filetypes allowed provided by Multisite
    18491850 * Super Admins at wp-admin/network/settings.php.
    18501851 *
Note: See TracChangeset for help on using the changeset viewer.